Merge branch 'stdenv-updates' into pi-stdenv-updates

pkgs/stdenv/generic/builder.sh

@@ -9,9 +9,15 @@ mkdir $out
 echo "$preHook" > $out/setup
 cat "$setup" >> $out/setup
 
+if [ "$withNixImpure" == 1 ]; then
+    # sed wants \&\& for a &&
+    niximpure='test -f /niximpure/impure.sh \&\& . /niximpure/impure.sh'
+fi
+
 sed -e "s^@initialPath@^$initialPath^g" \
     -e "s^@gcc@^$gcc^g" \
     -e "s^@shell@^$shell^g" \
+    -e "s^@niximpure@^$niximpure^g" \
     < $out/setup > $out/setup.tmp
 mv $out/setup.tmp $out/setup
 

pkgs/stdenv/generic/default.nix

@@ -1,5 +1,6 @@
 { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
 , extraAttrs ? {}, overrides ? (pkgs: {})
+, withNixImpure ? false
 
 , # The `fetchurl' to use for downloading curl and its dependencies
   # (see all-packages.nix).
@@ -26,7 +27,7 @@ let
 
         setup = setupScript;
 
-        inherit preHook initialPath gcc shell;
+        inherit preHook initialPath gcc shell withNixImpure;
 
         propagatedUserEnvPkgs = [gcc] ++
           lib.filter lib.isDerivation initialPath;

pkgs/stdenv/generic/setup.sh

@@ -270,6 +270,7 @@ elif [ "$NIX_BUILD_CORES" -le 0 ]; then
 fi
 export NIX_BUILD_CORES
 
+@niximpure@
 
 ######################################################################
 # Misc. helper functions.

pkgs/stdenv/linux/default.nix

@@ -95,6 +95,7 @@ rec {
       initialPath = [bootstrapTools] ++ extraPath;
       fetchurlBoot = fetchurl;
       inherit gcc;
+      withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
       # Having the proper 'platform' in all the stdenvs allows getting proper
       # linuxHeaders for example.
       extraAttrs = extraAttrs // { inherit platform; };
@@ -270,7 +271,7 @@ rec {
     inherit system;
     
     preHook = commonPreHook;
-    
+
     initialPath = 
       ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
       ++ [stdenvLinuxBoot4Pkgs.patchelf];
@@ -287,6 +288,8 @@ rec {
     shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
     
     fetchurlBoot = fetchurl;
+
+    withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
     
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;