From 09fee60ee260c468aabbc93c1321b002e7cd213d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Jan 2012 00:26:50 +0000
Subject: [PATCH] Fixing a typo. And letting stdenvCross be prioritary to the
 global override.

svn path=/nixpkgs/trunk/; revision=31748
---
 pkgs/top-level/all-packages.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 601ff4c5851..01cae669fed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -204,18 +204,19 @@ let
 
   stdenv =
     if bootStdenv != null then (bootStdenv // {inherit platform;}) else
-      let
-          changer = getConfig ["replaceStdenv"] null;
-      in if changer != null then
-        changer {
-          # We import again all-packages to avoid recursivities.
-          pkgs = import ./all-packages.nix {
-            # We remove packageOverrides to avoid recursivities
-            config = removeAttrs config [ "replaceStdenv" ];
-          };
-        }
-      else if crossSystem != null then
+      if crossSystem != null then
         stdenvCross
+      else
+        let
+            changer = getConfig ["replaceStdenv"] null;
+        in if changer != null then
+          changer {
+            # We import again all-packages to avoid recursivities.
+            pkgs = import ./all-packages.nix {
+              # We remove packageOverrides to avoid recursivities
+              config = removeAttrs config [ "replaceStdenv" ];
+            };
+          }
       else
         defaultStdenv;
 
@@ -2894,7 +2895,7 @@ let
 
   # Wrapper that works as gcc or g++
   # It can be used by setting in nixpkgs config like this, for example:
-  #    replaceStdenv = { pkgs }: (pkgs.ccacheStdenv "/var/ccache")
+  #    replaceStdenv = { pkgs }: (pkgs.ccacheStdenv "/var/ccache");
   # But if you build in chroot, you should have that path in chroot
   ccacheWrapper = cacheDir: wrapGCC (ccache.links cacheDir);
   ccacheStdenv = cacheDir: overrideGCC stdenv (ccacheWrapper cacheDir);