From 1065e8664238b7466bfe43ec44a0672a72f5443d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Mar 2010 14:38:53 +0000
Subject: [PATCH] * In nixos-rebuild, build config.environment.nix before
 trying nixFallback or nixUnstable.

svn path=/nixos/trunk/; revision=20376
---
 modules/installer/tools/nixos-rebuild.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index c5dce0a1807b..5c1faf7eb4f1 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -142,8 +142,10 @@ fi
 # more conservative.
 if test -n "$buildNix"; then
     echo "building Nix..." >&2
-    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
+    if ! nix-build $NIXOS -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+        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
     PATH=$tmpDir/nix/bin:$PATH
 fi