summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-02-28 13:27:43 +0000
committerzimbatm <zimbatm@zimbatm.com>2016-03-06 22:48:14 +0000
commit5e5494a85213d535843e86e228f078381ab57459 (patch)
tree23c05ef5dc6e08f9ce6a9cfb85eb2e25d37c8806 /pkgs/build-support
parentad47355786a24be1c86ee674c74cb774c469fb52 (diff)
downloadnixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar.gz
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar.bz2
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar.lz
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar.xz
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.tar.zst
nixpkgs-5e5494a85213d535843e86e228f078381ab57459.zip
make-wrapper.sh: add an --unset argument
`--set FOO ""` is not strictly equivalent to `--unset FOO`. In the former case
the environment variable still exists with an empty string as a value.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/setup-hooks/make-wrapper.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 5150b4f0218..7d0f88abb85 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -19,6 +19,12 @@ makeWrapper() {
             echo "export $varName=$value" >> $wrapper
         fi
 
+        if test "$p" = "--unset"; then
+            varName=${params[$((n + 1))]}
+            n=$((n + 1))
+            echo "unset $varName" >> "$wrapper"
+        fi
+
         if test "$p" = "--run"; then
             command=${params[$((n + 1))]}
             n=$((n + 1))