diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-01-14 12:12:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 12:12:21 +0100 |
| commit | 79851ec5934647ce34812943c77cd2a348b5a3ce (patch) | |
| tree | 20f3e007c64b766a2b0865ef08a8244dfbe9296d /pkgs/development/libraries/mesa | |
| parent | c898e9dd3cbb73c49eec1aa8d507b7fb3b90a0e2 (diff) | |
mesa: 20.3.2 -> 20.3.3 (#109310)
The "util: Disable memstream for Apple builds" patch got backported: https://gitlab.freedesktop.org/mesa/mesa/-/commit/6a006c35675636cb0d2cbfdfb1681b6639e0664d
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55264888e2a45..4f0a1c19ca31f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.2"; + version = "20.3.3"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; + sha256 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; }; prePatch = "patchShebangs ."; @@ -65,12 +65,6 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # Fix for pre macOS SDK 10.13: - (fetchpatch { # util: Disable memstream for Apple builds - # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; - sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; - }) ]; postPatch = '' |