Author: eelco
Date: Wed Apr 18 15:01:42 2012
New Revision: 33831
URL: https://nixos.org/websvn/nix/?rev=33831&sc=1
Log:
* Subtle: since nix-env processes flags in order, any ‘-I’ flag should
come before ‘-f <nixos>’.
Modified:
nixos/trunk/modules/installer/tools/nixos-rebuild.sh
Modified: nixos/trunk/modules/installer/tools/nixos-rebuild.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-rebuild.sh Wed Apr 18
14:28:30 2012 (r33830)
+++ nixos/trunk/modules/installer/tools/nixos-rebuild.sh Wed Apr 18
15:01:42 2012 (r33831)
@@ -152,7 +152,7 @@
if test -z "$rollback"; then
echo "building the system configuration..." >&2
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
elif test "$action" = test -o "$action" = build -o "$action" = dry-run;
then
nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
