diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-28 10:54:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-28 10:54:39 +0000 |
| commit | 0eff9a5236ab3412835144d8a53cb3e4f0e55cd9 (patch) | |
| tree | 07ebcbec4ff3b32da76dd379862f7ab85210e0d3 /pkgs/stdenv/initial | |
| parent | 036053fcba71310fa090067ffcfd16c76dda288c (diff) | |
| download | nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar.gz nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar.bz2 nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar.lz nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar.xz nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.tar.zst nixlib-0eff9a5236ab3412835144d8a53cb3e4f0e55cd9.zip | |
* Fix stdenv-initial.
svn path=/nixpkgs/trunk/; revision=7510
Diffstat (limited to 'pkgs/stdenv/initial')
| -rw-r--r-- | pkgs/stdenv/initial/builder.sh | 7 | ||||
| -rw-r--r-- | 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 6673f7fea156..8d287286a9c9 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 c43a268fa08d..1532406ba8b1 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; } // { |