public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

waf: move binary to $out/bin/

Browse Source 
Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes #79909
This commit is contained in:
Matthew Bauer 2020-03-06 00:08:06 -05:00 committed by Frederik Rietdijk
parent 93ba4ecd58
commit dfbe76a681
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/build-managers/waf/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
python waf-light build${wafToolsArg} python waf-light build${wafToolsArg}
''; '';
installPhase = '' installPhase = ''
install waf $out install -D waf $out/bin/waf
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/tools/build-managers/wafHook/setup-hook.sh
View File

@ -3,7 +3,7 @@ wafConfigurePhase() {
if ! [ -f "${wafPath:=./waf}" ]; then if ! [ -f "${wafPath:=./waf}" ]; then
echo "copying waf to $wafPath..." echo "copying waf to $wafPath..."
cp @waf@ "$wafPath" cp @waf@/bin/waf "$wafPath"
fi fi
if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then