From 8a0ea7f45bc0c61d7d745ef5e2873bb2e1554194 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 1 Jul 2024 12:33:16 +0300
Subject: [PATCH] mesa: fix build on Darwin

- remove merged patch
- add new python3.12 dep
---
 pkgs/development/libraries/mesa/darwin.nix   |  8 +-------
 pkgs/development/libraries/mesa/darwin.patch | 17 -----------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/darwin.patch

diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix
index 8d292939f047..aeeb8ab7648b 100644
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@@ -18,13 +18,6 @@ let
 in stdenv.mkDerivation {
   inherit (common) pname version src meta;
 
-  patches = [
-    # Reorder things to make it build on Darwin again
-    # Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29592
-    # FIXME: remove when merged or otherwise addressed
-    ./darwin.patch
-  ];
-
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
@@ -33,6 +26,7 @@ in stdenv.mkDerivation {
     meson
     ninja
     pkg-config
+    python3Packages.packaging
     python3Packages.python
     python3Packages.mako
   ];
diff --git a/pkgs/development/libraries/mesa/darwin.patch b/pkgs/development/libraries/mesa/darwin.patch
deleted file mode 100644
index 4649e09afb5f..000000000000
--- a/pkgs/development/libraries/mesa/darwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/glx/glxext.c b/src/glx/glxext.c
-index 8770863eb7c..537f0af112c 100644
---- a/src/glx/glxext.c
-+++ b/src/glx/glxext.c
-@@ -886,10 +886,11 @@ __glXInitialize(Display * dpy)
-    Bool zink = False;
-    Bool try_zink = False;
- 
-+   const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
-+
- #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
-    Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false);
-    Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
--   const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE");
- 
-    zink = env && !strcmp(env, "zink");
-    try_zink = False;