From c8eda85fb642d586d43d84f1daf2beb29162eb91 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 Feb 2022 12:31:25 +0100
Subject: [PATCH] mesa: 21.3.8 -> 22.0.1

The DRI drivers were removed [0]:
> Mesa's main branch no longer has any "classic" drivers, use the
> "amber" branch instead.

Mesa 21.3 provided the following DRI drivers:
i915 i965 r100 r200 nouveau

For nouveau, there is a Gallium3D driver as well, and i965 can be
replaced with iris or crocus (iris was already the default for
generation 8+ Intel iGPUs and crocus is a new driver for older hardware
that supports generation 4 to 7 iGPUs [1]).
(See also [2] for some more information.)

[0]: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8124721655532ee6f4149e20e9c61
[1]: https://airlied.blogspot.com/2021/04/crocus-gallium-for-gen4-7-generation.html
[2]: https://www.phoronix.com/scan.php?page=news_item&px=2021-Retire-Mesa-Classic-Main

Note: "-Ddri-drivers-path" is still required to avoid a dependency
cycle.

Release notes: https://docs.mesa3d.org/relnotes/22.0.0.html
---
 pkgs/development/libraries/mesa/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a48f4b42e453..6b79cc27658b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,7 +6,6 @@
 , libelf, libvdpau
 , libglvnd, libunwind
 , galliumDrivers ? ["auto"]
-, driDrivers ? ["auto"]
 , vulkanDrivers ? ["auto"]
 , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
 , OpenGL, Xplugin
@@ -34,7 +33,7 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "21.3.8";
+  version = "22.0.1";
   branch  = versions.major version;
 
 self = stdenv.mkDerivation {
@@ -48,7 +47,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 = "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7";
+    sha256 = "0vs20kyq9sxh52hd242yf7nz2wzw6di8jw7s19pb6q25qn19cpy0";
   };
 
   # TODO:
@@ -114,7 +113,6 @@ self = stdenv.mkDerivation {
     "-Ddri-search-path=${libglvnd.driverLink}/lib/dri"
 
     "-Dplatforms=${concatStringsSep "," eglPlatforms}"
-    "-Ddri-drivers=${concatStringsSep "," driDrivers}"
     "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}"
     "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}"