public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: 0.54.1 → 0.54.2

Browse Source 
https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2
This commit is contained in:
Jan Tojnar 2020-05-15 16:54:26 +02:00
parent bf60834d6d
commit 282cb2f8d6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -8,11 +8,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "0.54.1"; version = "0.54.2";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; sha256 = "p3Fu6uj43/AC5BR2Qliatklv+DnkN2pa7XYfg8H6BFU=";
}; };
postFixup = '' postFixup = ''

9
pkgs/development/tools/build-managers/meson/more-env-vars.patch
View File

@ -1,16 +1,13 @@
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index ac13a710..e0d07c51 100644 index 17058df6b..7a68b7f15 100644
--- a/mesonbuild/envconfig.py --- a/mesonbuild/envconfig.py
+++ b/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 # compiling we fall back on the unprefixed host version. This
# allows native builds to never need to worry about the 'BUILD_*' # allows native builds to never need to worry about the 'BUILD_*'
# ones. # ones.
- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), - ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
+ [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 # Always just the unprefixed host verions
- ([] if is_cross else [var_name]), [var_name]
+ [var_name],
)[for_machine] )[for_machine]
for var in candidates:
value = os.environ.get(var)