From f36e2fdd548b90fe03f7992535a5f53c891609a7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 23 Dec 2024 18:50:36 +0300
Subject: [PATCH 1/3] mesa-demos: mesa -> libgbm

---
 pkgs/by-name/me/mesa-demos/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/mesa-demos/package.nix b/pkgs/by-name/me/mesa-demos/package.nix
index d26fbe799dd5..362d98b0bffa 100644
--- a/pkgs/by-name/me/mesa-demos/package.nix
+++ b/pkgs/by-name/me/mesa-demos/package.nix
@@ -7,6 +7,7 @@
   libGLU,
   libX11,
   libXext,
+  libgbm,
   mesa,
   meson,
   ninja,
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
     libXext
     libGL
     libGLU
-    mesa
+    libgbm
     wayland
     wayland-protocols
     vulkan-loader

From a3f2328caec3ecde945deb3981dc473d958a8da6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 23 Dec 2024 18:52:42 +0300
Subject: [PATCH 2/3] simple-live-app: mesa -> libgbm

---
 pkgs/by-name/si/simple-live-app/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index 8d8a0c33dc61..9186f1f6a5d6 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -26,7 +26,7 @@
   libpulseaudio,
   libcaca,
   libdrm,
-  mesa,
+  libgbm,
   libXScrnSaver,
   nv-codec-headers-11,
   libXpresent,
@@ -96,7 +96,7 @@ flutter324.buildFlutterApplication rec {
     libpulseaudio
     libcaca
     libdrm
-    mesa
+    libgbm
     libXScrnSaver
     libXpresent
     nv-codec-headers-11

From f822aa993448d42e55188b67797ccf20044e8b41 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 23 Dec 2024 18:53:20 +0300
Subject: [PATCH 3/3] xorg/generate-expr-from-tarballs: map libgbm properly

Is this even used? I hope not...
---
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d0f88c4dfdbc..9fa149ffe1e3 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -34,7 +34,7 @@ $pcMap{"uuid"} = "libuuid";
 $pcMap{"libudev"} = "udev";
 $pcMap{"gl"} = "libGL";
 $pcMap{"GL"} = "libGL";
-$pcMap{"gbm"} = "mesa";
+$pcMap{"gbm"} = "libgbm";
 $pcMap{"hwdata"} = "hwdata";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";