diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-06 00:08:06 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-03-06 07:06:01 +0100 |
| commit | dfbe76a68126d03c3f7eb363d7acbb86335b63d3 (patch) | |
| tree | 1dd40597a76fa383bfa3e3d7b7d919bace37be22 | |
| parent | 93ba4ecd58602d3f69f74f9d45d60a8f949544e2 (diff) | |
| download | nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar.gz nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar.bz2 nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar.lz nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar.xz nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.tar.zst nixpkgs-dfbe76a68126d03c3f7eb363d7acbb86335b63d3.zip | |
waf: move binary to $out/bin/
Originally this was just the executable, but this breaks nix-shell usage. Instead, just do a normal directory. Fixes #79909
| -rw-r--r-- | pkgs/development/tools/build-managers/waf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 72ea74c9aad..4c8fa3f234b 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { python waf-light build${wafToolsArg} ''; installPhase = '' - install waf $out + install -D waf $out/bin/waf ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 3da86d3201f..38998e8db34 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -3,7 +3,7 @@ wafConfigurePhase() { if ! [ -f "${wafPath:=./waf}" ]; then echo "copying waf to $wafPath..." - cp @waf@ "$wafPath" + cp @waf@/bin/waf "$wafPath" fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then |