From cad7cea44a28cdd15f71d13e3816cd076821b64c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Sep 2023 21:59:20 -0300 Subject: [PATCH] waf: use wafConfigureFlags instead of configureFlags in setup-hook.sh As shown in https://github.com/NixOS/nixpkgs/commit/a79a8f29bc509b2d51158846c9562e64e1239b4c, tha variable can be overriden by other functions, especially those related to cross or static compilation. --- pkgs/development/tools/build-managers/waf/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index 34d2ca6a3641..2593b0a9d808 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -18,7 +18,7 @@ wafConfigurePhase() { local flagsArray=( $prefixFlag - $configureFlags "${configureFlagsArray[@]}" + $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} )