From a938e44b4a01105e29399df80c5da32becdfd78e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 7 May 2025 22:01:46 +0300
Subject: [PATCH] libgbm: 25.0.1 -> 25.1.0

No real changes other than the patch being merged.
---
 pkgs/development/libraries/mesa/gbm-header.patch | 13 -------------
 pkgs/development/libraries/mesa/gbm.nix          | 11 ++---------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/gbm-header.patch

diff --git a/pkgs/development/libraries/mesa/gbm-header.patch b/pkgs/development/libraries/mesa/gbm-header.patch
deleted file mode 100644
index e7811db3e4fb..000000000000
--- a/pkgs/development/libraries/mesa/gbm-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gbm/meson.build b/src/gbm/meson.build
-index eaed028d049..1a826c8792d 100644
---- a/src/gbm/meson.build
-+++ b/src/gbm/meson.build
-@@ -43,7 +43,7 @@ if with_tests
-   test('gbm-abi-check', abi_check, suite : ['gbm'])
- endif
- 
--install_headers('main/gbm.h')
-+install_headers('main/gbm.h', 'main/gbm_backend_abi.h')
- 
- pkg.generate(
-   name : 'gbm',
diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix
index 92b26b2a74da..af461413c200 100644
--- a/pkgs/development/libraries/mesa/gbm.nix
+++ b/pkgs/development/libraries/mesa/gbm.nix
@@ -20,23 +20,16 @@ stdenv.mkDerivation rec {
 
   # We don't use the versions from common.nix, because libgbm is a world rebuild,
   # so the updates need to happen separately on staging.
-  version = "25.0.1";
+  version = "25.1.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+    hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go";
   };
 
-  # Install gbm_backend_abi.h header - this is to simplify future iteration
-  # on building Mesa and friends with system libgbm.
-  # See also:
-  # - https://github.com/NixOS/nixpkgs/pull/387292
-  # - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33890
-  patches = [ ./gbm-header.patch ];
-
   mesonAutoFeatures = "disabled";
 
   mesonFlags = [