treewide: mesa -> libgbm, hopefully the last time (NixOS#367674)

khaneliman · Dec 23, 2024 · 0aa9c67 · 0aa9c67
2 parents 6b11d6f + f822aa9
commit 0aa9c67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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

diff --git 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

diff --git 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{"libudev"} = "udev";
 $pcMap{"gl"} = "libGL";
 $pcMap{"GL"} = "libGL";
-$pcMap{"gbm"} = "mesa";
+$pcMap{"gbm"} = "libgbm";
 $pcMap{"hwdata"} = "hwdata";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
       libGLU,
       libX11,
       libXext,
+      libgbm,
       mesa,
       meson,
       ninja,
@@ Expand Down Expand Up / @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { @@
         libXext
         libGL
         libGLU
-        mesa
+        libgbm
         wayland
         wayland-protocols
         vulkan-loader
@@ Expand Down @@