nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch

diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 17058df6b..7a68b7f15 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice,
         # compiling we fall back on the unprefixed host version. This
         # allows native builds to never need to worry about the 'BUILD_*'
         # ones.
-        ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
+        [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),
         # Always just the unprefixed host verions
         [var_name]
     )[for_machine]
meson: Patch to ingest env vars like autoconf See comment in code and the PR it references, https://github.com/mesonbuild/meson/pull/6827, for details. We can remove entries from the cross file because they will be gotten from env vars now. 2020-04-26 21:32:56 +01:00			`diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py`
meson: 0.54.1 → 0.54.2 https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2 2020-05-15 15:54:26 +01:00			`index 17058df6b..7a68b7f15 100644`
meson: Patch to ingest env vars like autoconf See comment in code and the PR it references, https://github.com/mesonbuild/meson/pull/6827, for details. We can remove entries from the cross file because they will be gotten from env vars now. 2020-04-26 21:32:56 +01:00			`--- a/mesonbuild/envconfig.py`
			`+++ b/mesonbuild/envconfig.py`
meson: 0.54.1 → 0.54.2 https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2 2020-05-15 15:54:26 +01:00			`@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice,`
meson: Patch to ingest env vars like autoconf See comment in code and the PR it references, https://github.com/mesonbuild/meson/pull/6827, for details. We can remove entries from the cross file because they will be gotten from env vars now. 2020-04-26 21:32:56 +01:00			`# compiling we fall back on the unprefixed host version. This`
			`# allows native builds to never need to worry about the 'BUILD_*'`
			`# ones.`
			`- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),`
			`+ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),`
			`# Always just the unprefixed host verions`
meson: 0.54.1 → 0.54.2 https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2 2020-05-15 15:54:26 +01:00			`[var_name]`
meson: Patch to ingest env vars like autoconf See comment in code and the PR it references, https://github.com/mesonbuild/meson/pull/6827, for details. We can remove entries from the cross file because they will be gotten from env vars now. 2020-04-26 21:32:56 +01:00			`)[for_machine]`