public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In nixos-rebuild, build config.environment.nix before trying nixFallback or nixUnstable.

Browse Source 
svn path=/nixos/trunk/; revision=20376
This commit is contained in:
Eelco Dolstra 2010-03-04 14:38:53 +00:00
parent 787b5cd7b9
commit 1065e86642
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/installer/tools/nixos-rebuild.sh
View File

@ -142,8 +142,10 @@ fi
# more conservative. # more conservative.
if test -n "$buildNix"; then if test -n "$buildNix"; then
echo "building Nix..." >&2 echo "building Nix..." >&2
if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then if ! nix-build $NIXOS -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
fi
fi fi
PATH=$tmpDir/nix/bin:$PATH PATH=$tmpDir/nix/bin:$PATH
fi fi