From 10ab227126bfab4ad1675b6b95f8c1e7e6370b2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 17:45:55 +0100
Subject: [PATCH] stdenv: Prepend SHELL=... to makeFlags

If it's appended, the user cannot override SHELL.
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4a5e3bac8fc..12c5801d5eb 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} \