* Subtle: since nix-env processes flags in order, any ‘-I’ flag should

come before ‘-f <nixos>’.

svn path=/nixos/trunk/; revision=33831
This commit is contained in:
Eelco Dolstra 2012-04-18 15:01:42 +00:00
parent cb74284b75
commit f8e36664a6

View File

@ -152,7 +152,7 @@ fi
if test -z "$rollback"; then if test -z "$rollback"; then
echo "building the system configuration..." >&2 echo "building the system configuration..." >&2
if test "$action" = switch -o "$action" = boot; then if test "$action" = switch -o "$action" = boot; then
nix-env -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system $extraBuildFlags nix-env $extraBuildFlags -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
pathToConfig=/nix/var/nix/profiles/system pathToConfig=/nix/var/nix/profiles/system
elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null