From d4aa650608fdbf78a9697e272d88f5f6e809744b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 6 May 2022 17:03:52 +0200 Subject: [PATCH] makeBinaryWrapper: really unset NIX_CFLAGS https://github.com/NixOS/nixpkgs/commit/f8cc8ff5755528d9a73671481ba3d6fb00f4e8d5 fails to unset the variables in the environment due to a Bash quirk, so set them to the empty string instead. --- pkgs/build-support/setup-hooks/make-binary-wrapper.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh index 7b69583574a..3931b37c242 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh @@ -33,8 +33,7 @@ assertExecutable() { # To troubleshoot a binary wrapper after you compiled it, # use the `strings` command or open the binary file in a text editor. makeWrapper() { - local NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK - unset NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK + local NIX_CFLAGS_COMPILE= NIX_CFLAGS_LINK= local original="$1" local wrapper="$2" shift 2