summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-12-13 11:36:18 +0100
committerVladimír Čunát <v@cunat.cz>2020-12-13 11:36:18 +0100
commit37dfd61f02dbbb75c088786b24c37eb08ddf446e (patch)
tree7c4b3a4f8b6080b05c04ceb8f1d2d0d6213492f7 /pkgs/development/libraries/mesa
parente955c4315f577d084afc3d6a792371ce58397223 (diff)
downloadnixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar.gz
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar.bz2
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar.lz
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar.xz
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.tar.zst
nixpkgs-37dfd61f02dbbb75c088786b24c37eb08ddf446e.zip
mesa: fix musl-specific patching
When updating to 20.2, this was apparently forgotten.
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r--pkgs/development/libraries/mesa/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f82896ca5ea..578763478f5 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -64,12 +64,8 @@ stdenv.mkDerivation {
       # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available
       (fetchpatch {
         name = "nine_debug-Make-tid-more-type-correct";
-        # Patch adjusted for version `20.1`, before the big mesa dirs change
-        # `gallium: rename 'state tracker' to 'frontend'`.
-        # Patch for versions after that change is at
-        #     https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e3b4745ef16d0e833300ad67044.patch
-        url = "https://gitlab.freedesktop.org/nh2/mesa/commit/3385c49684375f1153a52ed7ccda3f5135268a41.patch";
-        sha256 = "1ci694sqjll44c9g2md4krhk6qlvq51r7ad5rnnfdnf3l8ys0i50";
+        url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
+        sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
       })
     ]
     # do not prefix user provided dri-drivers-path