alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Don't create a temporary file in $HOME.

Browse source 
svn path=/nixos/branches/modular-nixos/; revision=16561
This commit is contained in:
Eelco Dolstra 2009-08-03 12:44:45 +00:00
parent 6802a75076
commit 383370f782
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/installer/tools/nixos-rebuild.sh
View file

@ -81,6 +81,10 @@ if test "$action" = dry-run; then
fi
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
trap 'rm -rf "$tmpDir"' EXIT
# If the Nix daemon is running, then use it. This allows us to use
# the latest Nix from Nixpkgs (below) for expression evaluation, while
# still using the old Nix (via the daemon) for actual store access.
@ -109,10 +113,10 @@ fi
# current one. Of course, the same goes for Nixpkgs, but Nixpkgs is
# more conservative.
if test -n "$buildNix"; then
if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
nix-build $NIXPKGS -A nixUnstable -o $HOME/nix-tmp
if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix; then
nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix
fi
PATH=$HOME/nix-tmp/bin:$PATH
PATH=$tmpDir/nix/bin:$PATH
fi
@ -145,6 +149,3 @@ active system configuration may be garbage collected! This may render
the system inoperable (though a reboot will fix things).
EOF
fi
rm -f $HOME/nix-tmp