diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:49:21 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:51:12 +0100 |
| commit | b9c0b3f126472b144c543d8d77a8047e8d905ada (patch) | |
| tree | 2ad99b8789bcb62b993ed18d2877905f7f02bdac /nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch | |
| parent | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (diff) | |
| parent | c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad (diff) | |
| download | nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.gz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.bz2 nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.lz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.xz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.zst nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch')
| -rw-r--r-- | nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch b/nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch new file mode 100644 index 000000000000..e4ad43550423 --- /dev/null +++ b/nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch @@ -0,0 +1,12 @@ +diff -Naur meson-0.60.2-old/mesonbuild/environment.py meson-0.60.2-new/mesonbuild/environment.py +--- meson-0.60.2-old/mesonbuild/environment.py 2021-11-02 16:58:13.000000000 -0300 ++++ meson-0.60.2-new/mesonbuild/environment.py 2021-12-12 17:44:00.350499307 -0300 +@@ -68,7 +68,7 @@ + # 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 versions + [var_name] + )[for_machine] |