ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Tweaks for nix-shell

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-19 14:36:52 +02:00
parent 7cd386894d
commit 659c829e88
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dev-shell Executable file
View file

@ -0,0 +1,7 @@
#! /bin/sh
s=$(type -p nix-shell)
exec $s release.nix -A build.x86_64-linux --exclude tarball --command "
export NIX_REMOTE=daemon
export NIX_PATH='$NIX_PATH'
export NIX_BUILD_SHELL=$(type -p bash)
exec $s release.nix -A tarball" "$@"

4
doc/manual/manual.xml
View file

@ -52,8 +52,7 @@
<copyright> <copyright>
<year>2009</year> <year>2009-2013</year>
<year>2010</year>
<holder>Eelco Dolstra</holder> <holder>Eelco Dolstra</holder>
</copyright> </copyright>
@ -64,6 +63,7 @@
<xi:include href="introduction.xml" /> <xi:include href="introduction.xml" />
<xi:include href="installation.xml" /> <xi:include href="installation.xml" />
<xi:include href="projects.xml" /> <xi:include href="projects.xml" />
<xi:include href="hacking.xml" />
</book> </book>

4
release.nix
View file

@ -24,7 +24,7 @@ in rec {
versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}"; versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}";
preConfigure = '' preHook = ''
# TeX needs a writable font cache. # TeX needs a writable font cache.
export VARTEXFONTS=$TMPDIR/texfonts export VARTEXFONTS=$TMPDIR/texfonts
''; '';
@ -118,7 +118,7 @@ in rec {
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
preConfigure = "patchShebangs ."; preCheck = "patchShebangs .";
postInstall = '' postInstall = ''
mkdir -p $out/nix-support mkdir -p $out/nix-support