From e63683d14cdacb4ffd1f5c34b5c03647b509b9ae Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 20 Dec 2024 10:44:14 +0300
Subject: [PATCH] mesa: source Darwin patches from upstream

---
 .../libraries/mesa/darwin-build-fix.patch           | 13 -------------
 pkgs/development/libraries/mesa/darwin.nix          | 12 ++++++++++--
 2 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/darwin-build-fix.patch

diff --git a/pkgs/development/libraries/mesa/darwin-build-fix.patch b/pkgs/development/libraries/mesa/darwin-build-fix.patch
deleted file mode 100644
index ed4c5afa0adc..000000000000
--- a/pkgs/development/libraries/mesa/darwin-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/glx/glxext.c b/src/glx/glxext.c
-index b03554487c3..9738dbdcaf2 100644
---- a/src/glx/glxext.c
-+++ b/src/glx/glxext.c
-@@ -28,7 +28,7 @@
- #include "glxextensions.h"
- 
- #include "util/u_debug.h"
--#ifndef GLX_USE_APPLEGL
-+#if !defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)
- #include "dri_common.h"
- #endif
- 
diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix
index 37f0742d4023..55392071010a 100644
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@@ -3,6 +3,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   bison,
   flex,
   libxml2,
@@ -26,9 +27,16 @@ stdenv.mkDerivation {
     meta
     ;
 
+  # Darwin build fixes. FIXME: remove in 25.1.
   patches = [
-    # Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32497
-    ./darwin-build-fix.patch
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/e89eba0796b3469f1d2cdbb600309f6231a8169d.patch";
+      hash = "sha256-0EP0JsYy+UTQ+eGd3sMfoLf1R+2e8n1flmQAHq3rCR4=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/568a4ca899762fe96fc9b34d2288d07e6656af87.patch";
+      hash = "sha256-uLxa5vA3/cYAIJT9h7eBQ1EBu4MnMg9R5uGAHzTb5Fc=";
+    })
   ];
 
   outputs = [