about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-12-27 21:03:16 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-12-27 21:03:16 +0100
commit3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8 (patch)
treea5dc160f80eb93d112a4994e65f6c87503914dd1
parent34a7256820fe8c504ff519377c8ab2a9ac068ebb (diff)
downloadnixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar.gz
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar.bz2
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar.lz
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar.xz
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.tar.zst
nixlib-3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8.zip
stdenv/setup.sh: add SHELL to makeFlags (close #1354)
-rw-r--r--pkgs/stdenv/generic/setup.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 84d499696c92..96168da77537 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -109,6 +109,8 @@ runHook preHook
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
 
+# see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
+makeFlags="${makeFlags} SHELL=${SHELL}"
 
 # Hack: run gcc's setup hook.
 envHooks=()