diff options
Diffstat (limited to 'pkgs/by-name/wa/waf')
-rw-r--r-- | pkgs/by-name/wa/waf/hook.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/wa/waf/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/wa/waf/setup-hook.sh | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index ac497d2278314..c53af17321c3e 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -13,12 +13,10 @@ makeSetupHook { # waf is not inserted into propagatedBuildInputs, rather it is inserted # directly inherit waf; - wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; meta = { - description = "A setup hook for using Waf in Nixpkgs"; + description = "Setup hook for using Waf in Nixpkgs"; inherit (waf.meta) maintainers platforms broken; }; } ./setup-hook.sh diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 9dd0e9339d873..812c6dd9b8d73 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://waf.io"; - description = "The meta build system"; + description = "Meta build system"; changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd3; mainProgram = "waf"; diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index d3e2bf97e6823..a154ae378a07c 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -22,10 +22,6 @@ wafConfigurePhase() { ${wafConfigureTargets:-configure} ) - if [ -z "${dontAddWafCrossFlags:-}" ]; then - flagsArray+=(@wafCrossFlags@) - fi - echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" |