From d3edadc491f05f105ded0fb5c026e1a21b336ab2 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sat, 27 May 2023 20:51:53 +0200
Subject: [PATCH] mesa_22_3: drop

---
 pkgs/development/libraries/mesa/22.3.nix                 | 4 ----
 pkgs/development/libraries/mesa/23.0.nix                 | 4 ----
 .../libraries/mesa/{generic.nix => default.nix}          | 5 +++--
 pkgs/top-level/all-packages.nix                          | 9 +--------
 4 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/22.3.nix
 delete mode 100644 pkgs/development/libraries/mesa/23.0.nix
 rename pkgs/development/libraries/mesa/{generic.nix => default.nix} (99%)

diff --git a/pkgs/development/libraries/mesa/22.3.nix b/pkgs/development/libraries/mesa/22.3.nix
deleted file mode 100644
index 1a1127dae508..000000000000
--- a/pkgs/development/libraries/mesa/22.3.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "22.3.7";
-  hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw=";
-}
diff --git a/pkgs/development/libraries/mesa/23.0.nix b/pkgs/development/libraries/mesa/23.0.nix
deleted file mode 100644
index 323e00196181..000000000000
--- a/pkgs/development/libraries/mesa/23.0.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "23.0.3";
-  hash = "sha256-OGNipdgN87CWY2tn80Dhzme3BbRHZ9W90R0u0QNxktU=";
-}
diff --git a/pkgs/development/libraries/mesa/generic.nix b/pkgs/development/libraries/mesa/default.nix
similarity index 99%
rename from pkgs/development/libraries/mesa/generic.nix
rename to pkgs/development/libraries/mesa/default.nix
index ea7c1cb8b7b5..7cd22c077a7e 100644
--- a/pkgs/development/libraries/mesa/generic.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,3 @@
-{ version, hash }:
-
 { stdenv, lib, fetchurl, fetchpatch
 , meson, pkg-config, ninja
 , intltool, bison, flex, file, python3Packages, wayland-scanner
@@ -87,6 +85,9 @@
 */
 
 let
+  version = "23.0.3";
+  hash = "sha256-OGNipdgN87CWY2tn80Dhzme3BbRHZ9W90R0u0QNxktU=";
+
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
   branch = lib.versions.major version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dc0031c2228..d8ee4178a4f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23005,17 +23005,10 @@ with pkgs;
   # Default libGLU
   libGLU = mesa_glu;
 
-  # Keep Mesa 22.3 for now because 23.0 does not build on Darwin.
-  # FIXME: remove, also investigate why we even need Mesa on Darwin.
-  mesa_22_3 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.nix {
+  mesa = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa {
     inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
     inherit (darwin.apple_sdk_11_0.libs) Xplugin;
   };
-  mesa_23_0 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.nix {
-    inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
-    inherit (darwin.apple_sdk_11_0.libs) Xplugin;
-  };
-  mesa = if stdenv.isDarwin then mesa_22_3 else mesa_23_0;
 
   mesa_glu =  callPackage ../development/libraries/mesa-glu {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;