diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-28 11:32:20 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-28 11:32:20 +0000 |
| commit | 98e5779a9ba78ba70bf432b4db87a8d55420c13c (patch) | |
| tree | 6db6e2c3bf5e91dc524921d16733dc5090402e5b /pkgs/stdenv/generic | |
| parent | bb9f4a2280671eec16d977c4345a9fd15e0292eb (diff) | |
| download | nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar.gz nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar.bz2 nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar.lz nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar.xz nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.tar.zst nixlib-98e5779a9ba78ba70bf432b4db87a8d55420c13c.zip | |
* Don't clobber $shell.
svn path=/nixpkgs/trunk/; revision=7512
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 3d4ef2e18461..89a65af87497 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -16,7 +16,9 @@ fi # Execute the pre-hook. export SHELL=@shell@ -export shell=@shell@ +if test -z "$shell"; then + export shell=@shell@ +fi param1=@param1@ param2=@param2@ param3=@param3@ |