diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-10-10 08:33:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-10 08:33:35 -0500 |
| commit | a74c8378137a23c0d747a617e46a45e134da67aa (patch) | |
| tree | c64493de34df72525bb507867335bc0711d510d9 /pkgs | |
| parent | d384d8bec5e42b79890dd88182e518bdf05601ca (diff) | |
| parent | 92c96af1f1af20c734c52799f4778f29c25c2f52 (diff) | |
| download | nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar.gz nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar.bz2 nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar.lz nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar.xz nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.tar.zst nixlib-a74c8378137a23c0d747a617e46a45e134da67aa.zip | |
Merge pull request #258263 from trofi/meson-update
meson: 1.2.1 -> 1.2.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8758afea8211..f6002a7607c8 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; + hash = "sha256-SujnalAooIlzKZcjt0E4tSBO0J5QRkSE0X1PVpnbIF4="; }; patches = [ @@ -75,6 +75,15 @@ python3.pkgs.buildPythonApplication rec { "docs/yaml/objects/dep.yaml" ]; }) + + # Revert patch breaking mesa build on bindgen: + # https://github.com/mesonbuild/meson/issues/12326 + (fetchpatch { + name = "bindgen-flags-revert.patch"; + url = "https://github.com/mesonbuild/meson/commit/d5546bdceaa2f3040d16a33fcbd824ba94b8cfde.patch"; + hash = "sha256-qOSiWGkjfxJmUfXmqV05yl7wTgAIE0Z7qZqTko9f/LE="; + revert = true; + }) ]; setupHook = ./setup-hook.sh; |