diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-07 17:45:55 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-07 17:45:55 +0100 |
| commit | 10ab227126bfab4ad1675b6b95f8c1e7e6370b2d (patch) | |
| tree | dc73562043b48d17eb44cbbb31af0dc13d899e1c /pkgs/stdenv/generic | |
| parent | ffd6557dc603083d35b4bfad7b1f2dcd328b4ad0 (diff) | |
| download | nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar.gz nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar.bz2 nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar.lz nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar.xz nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.tar.zst nixlib-10ab227126bfab4ad1675b6b95f8c1e7e6370b2d.zip | |
stdenv: Prepend SHELL=... to makeFlags
If it's appended, the user cannot override SHELL.
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4a5e3bac8fcf..12c5801d5eb9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -614,8 +614,8 @@ buildPhase() { return fi - # see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 - makeFlags="${makeFlags} SHELL=${SHELL}" + # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 + makeFlags="SHELL=$SHELL $makeFlags" echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" make ${makefile:+-f $makefile} \ |