pyrox.dev
meson: 0.54.1 → 0.54.2
https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2
+2
-2
pkgs/development/tools/build-managers/meson/default.nix
+2
-2
pkgs/development/tools/build-managers/meson/default.nix
···
8
8
9
9
python3Packages.buildPythonApplication rec {
10
10
pname = "meson";
11
-
version = "0.54.1";
11
+
version = "0.54.2";
12
12
13
13
src = python3Packages.fetchPypi {
14
14
inherit pname version;
15
-
sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw=";
15
+
sha256 = "p3Fu6uj43/AC5BR2Qliatklv+DnkN2pa7XYfg8H6BFU=";
16
16
};
17
17
18
18
postFixup = ''
+3
-6
pkgs/development/tools/build-managers/meson/more-env-vars.patch
+3
-6
pkgs/development/tools/build-managers/meson/more-env-vars.patch
···
1
1
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
2
-
index ac13a710..e0d07c51 100644
2
+
index 17058df6b..7a68b7f15 100644
3
3
--- a/mesonbuild/envconfig.py
4
4
+++ b/mesonbuild/envconfig.py
5
-
@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice,
5
+
@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice,
6
6
# compiling we fall back on the unprefixed host version. This
7
7
# allows native builds to never need to worry about the 'BUILD_*'
8
8
# ones.
9
9
- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
10
10
+ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),
11
11
# Always just the unprefixed host verions
12
-
- ([] if is_cross else [var_name]),
13
-
+ [var_name],
12
+
[var_name]
14
13
)[for_machine]
15
-
for var in candidates:
16
-
value = os.environ.get(var)