diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 16:54:26 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 16:58:41 +0200 |
| commit | 282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa (patch) | |
| tree | 43de606b3c70db751b9b4b7e099a68b25f32cf47 | |
| parent | bf60834d6dfa41a87f357f48f74a56b718860be8 (diff) | |
| download | nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar.gz nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar.bz2 nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar.lz nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar.xz nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.tar.zst nixlib-282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa.zip | |
meson: 0.54.1 → 0.54.2
https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/more-env-vars.patch | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index a2dc1424d65f..0a61b8d02a99 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -8,11 +8,11 @@ python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.54.1"; + version = "0.54.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; + sha256 = "p3Fu6uj43/AC5BR2Qliatklv+DnkN2pa7XYfg8H6BFU="; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch index a8f860f03cc7..6326f5ec3cfb 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,16 +1,13 @@ diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index ac13a710..e0d07c51 100644 +index 17058df6b..7a68b7f15 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice, +@@ -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 -- ([] if is_cross else [var_name]), -+ [var_name], + [var_name] )[for_machine] - for var in candidates: - value = os.environ.get(var) |