diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-31 15:46:11 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-07-10 22:19:16 +0200 |
| commit | 7e1e6577c5804d6e25b66e1553206f4fd8399405 (patch) | |
| tree | f19e36347d7f2cf5ad79cecf2f2878e72510bd8e | |
| parent | Merge #316074: libiconv-darwin: fix crash and add support for static builds (diff) | |
| download | nixpkgs-7e1e6577c5804d6e25b66e1553206f4fd8399405.tar.gz | |
meson: 1.4.0 -> 1.4.1
(cherry picked from commit 9d76da314b9262ae22086f859f4a815e7b33a54d)
| -rw-r--r-- | pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch | 17 | ||||
| -rw-r--r-- | pkgs/by-name/me/meson/package.nix | 8 |
2 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch index 0a2eda9de9ac..bfc55b3c0ffb 100644 --- a/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch +++ b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch @@ -1,13 +1,18 @@ -diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py ---- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300 -+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300 -@@ -682,16 +682,7 @@ +diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py +index 11cf0beca..80f950866 100644 +--- a/mesonbuild/dependencies/boost.py ++++ b/mesonbuild/dependencies/boost.py +@@ -687,20 +687,7 @@ class BoostDependency(SystemDependency): else: - tmp = [] # type: T.List[Path] + tmp: T.List[Path] = [] - # Add some default system paths +- if m.is_darwin(): +- tmp.extend([ +- Path('/opt/homebrew/'), # for Apple Silicon MacOS +- Path('/usr/local/opt/boost'), # for Intel Silicon MacOS +- ]) - tmp += [Path('/opt/local')] -- tmp += [Path('/usr/local/opt/boost')] - tmp += [Path('/usr/local')] - tmp += [Path('/usr')] - diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b2c85c431e01..d49c802724a7 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -18,13 +18,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-hRTmKO2E6SIdvAhO7OJtV8dcsGm39c51H+2ZGEkdcFY="; + hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4="; }; patches = [ @@ -65,10 +65,6 @@ python3.pkgs.buildPythonApplication rec { # Nixpkgs cctools does not have bitcode support. ./006-disable-bitcode.patch - - # Fix cross-compilation of proc-macro (and mesa) - # https://github.com/mesonbuild/meson/issues/12973 - ./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [ |