summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-10 14:09:53 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-10 14:09:53 +0100
commit1455ecee734d537766ee61515c77582a9ebd5309 (patch)
treee32e3adfb131ac46a45c9c059f2186f9a124d109 /pkgs/stdenv
parent78b01de68d6ecb65ed3b3220e96d290e116436aa (diff)
downloadnixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar.gz
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar.bz2
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar.lz
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar.xz
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.tar.zst
nixpkgs-1455ecee734d537766ee61515c77582a9ebd5309.zip
Ensure a correct value for $BASH
Previously it was set to /run/current-system/sw/sbin/nologin or
similar.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 987d7766ce8..e9cb75bb694 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -176,10 +176,11 @@ fi
 
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
+BASH="$SHELL"
+export CONFIG_SHELL="$SHELL"
 
 
 # Execute the pre-hook.
-export CONFIG_SHELL="$SHELL"
 if [ -z "$shell" ]; then export shell=$SHELL; fi