diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-06-12 18:48:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-06-12 18:48:53 +0200 |
| commit | 9d428a527691a17bb0cc31a167841c2610da308a (patch) | |
| tree | 29be26f571ab82d874a9267d6154055d7bd72f58 /pkgs/by-name/wa | |
| parent | 6653c16e33c9dd995cd222e174aca837cb6e8e7b (diff) | |
| parent | 2ff09eadf5a41ffd4c1054c606a9455f974753a0 (diff) | |
Merge #316075: staging-next 2024-05-31
Diffstat (limited to 'pkgs/by-name/wa')
| -rw-r--r-- | pkgs/by-name/wa/waf/hook.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/wa/waf/setup-hook.sh | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index 07c311f54c772..c53af17321c3e 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -13,8 +13,6 @@ 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 = { 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[@]}" |