diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 18:30:07 +0100 |
---|---|---|
committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 18:32:29 +0100 |
commit | f075de5c258ee9adfb300c8aee07125948b6f03d (patch) | |
tree | c605a9a8857d23fde77252696924a8d9f4fd1688 /pkgs/development/tools/build-managers/waf | |
parent | 07b42ccf2de451342982b550657636d891c4ba35 (diff) | |
download | nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar.gz nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar.bz2 nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar.lz nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar.xz nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.tar.zst nixlib-f075de5c258ee9adfb300c8aee07125948b6f03d.zip |
wafHook: let derivations use an existing waf in a non-standard location
this is necessary for talloc
Diffstat (limited to 'pkgs/development/tools/build-managers/waf')
-rw-r--r-- | pkgs/development/tools/build-managers/waf/setup-hook.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index b8a448df8ef8..c1ff160982a0 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,8 +1,9 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f ./waf ]; then - cp @waf@ waf + if ! [ -f "${wafPath:=./waf}" ]; then + echo "copying waf to $wafPath..." + cp @waf@ "$wafPath" fi if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then @@ -14,7 +15,7 @@ wafConfigurePhase() { ${configureTargets:-configure} ) echoCmd 'configure flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postConfigure } @@ -33,7 +34,7 @@ wafBuildPhase () { ) echoCmd 'build flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -52,7 +53,7 @@ wafInstallPhase() { ) echoCmd 'install flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postInstall } |