From 4c1a1175f822ec2ceeec4c00febfb2a9fcdfc550 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 6 Apr 2025 16:09:30 -0400 Subject: [PATCH 1/2] wafHook: run waf without explicit python interpreter --- pkgs/by-name/wa/waf/setup-hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index 5d7c3dc61eda..e98a92ad8a35 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -19,7 +19,7 @@ wafConfigurePhase() { concatTo flagsArray wafConfigureFlags wafConfigureFlagsArray wafConfigureTargets=configure echoCmd 'waf configure flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 @@ -41,7 +41,7 @@ wafBuildPhase () { concatTo flagsArray wafFlags wafFlagsArray wafBuildFlags wafBuildFlagsArray wafBuildTargets=build echoCmd 'waf build flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -57,7 +57,7 @@ wafInstallPhase() { concatTo flagsArray wafFlags wafFlagsArray wafInstallFlags wafInstallFlagsArray wafInstallTargets=install echoCmd 'waf install flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" runHook postInstall } From db67e8f570a4e8aa22de50b72ced9658f689dae1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 6 Apr 2025 18:15:52 -0400 Subject: [PATCH 2/2] wafHook: do patchShebangs on $wafPath --- pkgs/by-name/wa/waf/setup-hook.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index e98a92ad8a35..7ce4f8e4abd1 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -3,7 +3,9 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f "${wafPath:=./waf}" ]; then + if [ -f "${wafPath:=./waf}" ]; then + patchShebangs --build "${wafPath}" + else wafPath="@waf@/bin/waf" fi