From 98e5779a9ba78ba70bf432b4db87a8d55420c13c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Dec 2006 11:32:20 +0000 Subject: [PATCH] * Don't clobber $shell. svn path=/nixpkgs/trunk/; revision=7512 --- pkgs/stdenv/generic/setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 3d4ef2e1846..89a65af8749 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@