diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-06-18 22:31:45 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-06-18 22:58:15 +0200 |
| commit | ecbe6c123f23aa72cb0ead618a8b2d3099a9b361 (patch) | |
| tree | 0cfcdefabdcf809c7ad04e38b0f5418b9020d1d3 /pkgs/development/libraries/mesa | |
| parent | 4ea74538cedf4df7dd6758f6b585cd103b6b5c62 (diff) | |
| download | nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar.gz nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar.bz2 nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar.lz nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar.xz nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.tar.zst nixpkgs-ecbe6c123f23aa72cb0ead618a8b2d3099a9b361.zip | |
mesa: 21.1.2 -> 21.1.3
I've also updated the URL for the RISC-V patch in case the content of the old URL will change (not sure if that's possible after a merge request is merged but now that the patch is upstream it seems like a good idea regardless; and the content has actually already changed so the old hash wasn't correct anymore).
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0e24d27b0d7..bdecfe0d57a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.2"; + version = "21.1.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = 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 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13"; + sha256 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb"; }; prePatch = "patchShebangs ."; @@ -64,10 +64,11 @@ self = stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) + # For RISC-V support: (fetchpatch { name = "add-riscv-default-selections.patch"; - url = "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11346.patch"; - sha256 = "1nwqslr1g6m83i0r40710havkyf03yxkgaiwgxz2zlw2xkbrnzw0"; + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch"; + sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w"; }) ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. |