From 6fd4f635300303906fd4b068b196b8e1310b9e6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Dec 2012 15:46:45 +0100
Subject: [PATCH] Revert "Merge pull request #229 from
 viric/niximpure2-stdenv-updates"

This reverts commit e04b17bfbaa4dbd5252d59f727d7d84ffe25f568, reversing
changes made to 1af2ada7d4c61e79356a0f3f8bcced6159a6e751.
---
 pkgs/stdenv/generic/builder.sh  | 6 ------
 pkgs/stdenv/generic/default.nix | 3 +--
 pkgs/stdenv/generic/setup.sh    | 1 -
 pkgs/stdenv/linux/default.nix   | 5 +----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 6274200900cc..fd4c17ca2519 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -9,15 +9,9 @@ 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
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 0494d6f00f5d..20cbb1b455ca 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -1,6 +1,5 @@
 { 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).
@@ -27,7 +26,7 @@ let
 
         setup = setupScript;
 
-        inherit preHook initialPath gcc shell withNixImpure;
+        inherit preHook initialPath gcc shell;
 
         propagatedUserEnvPkgs = [gcc] ++
           lib.filter lib.isDerivation initialPath;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a6816f8ba1d7..a9f9aa2af2f5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -270,7 +270,6 @@ elif [ "$NIX_BUILD_CORES" -le 0 ]; then
 fi
 export NIX_BUILD_CORES
 
-@niximpure@
 
 ######################################################################
 # Misc. helper functions.
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 73768e8f40e7..3105e76f8177 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -94,7 +94,6 @@ 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; };
@@ -265,7 +264,7 @@ rec {
     inherit system;
     
     preHook = commonPreHook;
-
+    
     initialPath = 
       ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
       ++ [stdenvLinuxBoot4Pkgs.patchelf];
@@ -282,8 +281,6 @@ rec {
     shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
     
     fetchurlBoot = fetchurl;
-
-    withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
     
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;