From 0eff9a5236ab3412835144d8a53cb3e4f0e55cd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Dec 2006 10:54:39 +0000
Subject: [PATCH] * Fix stdenv-initial.

svn path=/nixpkgs/trunk/; revision=7510
---
 pkgs/stdenv/initial/builder.sh  | 7 ++-----
 pkgs/stdenv/initial/default.nix | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/initial/builder.sh b/pkgs/stdenv/initial/builder.sh
index 6673f7fea15..8d287286a9c 100644
--- a/pkgs/stdenv/initial/builder.sh
+++ b/pkgs/stdenv/initial/builder.sh
@@ -1,8 +1,5 @@
 export PATH=/usr/bin:/bin
 
 mkdir $out
-cat > $out/setup <<EOF
-export PATH=/usr/bin:/bin
-export SHELL=/bin/sh
-EOF
-chmod +x $out/setup
+
+sed -e "s^@initialPath@^/usr /^" -e "s^@preHook@^^" -e "s^@postHook@^^" -e "s^@shell@^/bin/sh^" < $stdenvScript > $out/setup
diff --git a/pkgs/stdenv/initial/default.nix b/pkgs/stdenv/initial/default.nix
index c43a268fa08..1532406ba8b 100644
--- a/pkgs/stdenv/initial/default.nix
+++ b/pkgs/stdenv/initial/default.nix
@@ -15,6 +15,7 @@ let {
       inherit system name;
       builder = shell;
       args = ["-e" ./builder.sh];
+      stdenvScript = ../generic/setup.sh;
     }
 
     // {