mesa: 25.3.0 -> 25.3.1

pkgs/development/libraries/mesa/common.nix

@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.3.0";
+  version = "25.3.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-MviXDRAbCEXM9dIzD94/CM0bjlF4zCJUVE91Xst/uII=";
+    hash = "sha256-ESaVKbAieCQcSs4WHyajSpBUWcHrldveXcb9PO63XWc=";
   };
 
   meta = {

pkgs/development/libraries/mesa/darwin.nix

@@ -25,11 +25,6 @@ stdenv.mkDerivation {
     meta
     ;
 
-  patches = [
-    # Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38429
-    ./fix-darwin-build.patch
-  ];
-
   outputs = [
     "out"
     "dev"

pkgs/development/libraries/mesa/fix-darwin-build.patch

@@ -1,34 +0,0 @@
-diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c
-index 81b6730f8e29b3920216461858b98bcd3b7a870c..9bdfe555949482ddb6153ee926967ac5c04fe7c8 100644
---- a/src/glx/apple/apple_cgl.c
-+++ b/src/glx/apple/apple_cgl.c
-@@ -34,6 +34,7 @@
- 
- #include "apple_cgl.h"
- #include "apple_glx.h"
-+#include "util/os_misc.h"
- 
- #ifndef OPENGL_FRAMEWORK_PATH
- #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
-diff --git a/src/loader/loader.c b/src/loader/loader.c
-index d06a368c1bbff180fcc9432183db66398b75f4a3..0567beb3dee569895fbb36c7e7c3df34be8b32b7 100644
---- a/src/loader/loader.c
-+++ b/src/loader/loader.c
-@@ -139,6 +139,9 @@ iris_predicate(int fd, const char *driver)
- bool
- nouveau_zink_predicate(int fd, const char *driver)
- {
-+#ifndef HAVE_LIBDRM
-+   return true;
-+#else
-    /* Never load on nv proprietary driver */
-    if (!drm_fd_is_nouveau(fd))
-       return false;
-@@ -191,6 +194,7 @@ nouveau_zink_predicate(int fd, const char *driver)
-    if (!use_zink && !strcmp(driver, "nouveau"))
-       return true;
-    return false;
-+#endif
- }
- 
-