treewide: mesa -> libgbm/nothing

Mostly replaces mesa with libgbm for things that need libgbm. Also sometimes just removes mesa entirely, because someone copy-pasted it a bunch "for libEGL headers" that are actually in glvnd.
NixOS · Sep 20, 2024 · 29db9a0 · 29db9a0
1 parent a1aae45
commit 29db9a0
Show file tree

Hide file tree

Showing 199 changed files with 389 additions and 397 deletions.
diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }:
+{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, libgbm, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "aether-lv2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    lv2 libX11 libGL libGLU mesa
+    lv2 libX11 libGL libGLU libgbm
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [

diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, mesa, libsndfile, libsamplerate }:
+{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, libgbm, libsndfile, libsamplerate }:
 
 stdenv.mkDerivation rec {
   pname = "ninjas2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate
+    libjack2 xorg.libX11 libGL libgbm libsndfile libsamplerate
   ];
 
   installPhase = ''

diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu
+{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, libgbm, libGLU, libX11, libXmu
 , libXext, libXi }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libglut
     alsa-lib
-    mesa
+    libgbm
     libGLU
     libsndfile
     libX11

diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix
@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype
 , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity
-, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
+, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, libgbm, libxkbcommon
 , pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL
   # High-DPI support: Spotify's --force-device-scale-factor argument
   # not added if `null`, otherwise, should be a number.
@@ -49,7 +49,7 @@ let
     libpng
     libpulseaudio
     libxkbcommon
-    mesa
+    libgbm
     nss_latest
     pango
     stdenv.cc.cc

diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, mesa, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, libgbm, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "stone-phaser";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    xorg.libX11 cairo libGL lv2 libjack2 mesa
+    xorg.libX11 cairo libGL lv2 libjack2 libgbm
   ];
 
   postPatch = ''

diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix
@@ -27,7 +27,7 @@
 , libsecret
 , libuuid
 , libxkbcommon
-, mesa
+, libgbm
 , nss
 , pango
 , systemd
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     pango
     systemd
-    mesa # for libgbm
+    libgbm
     nss
     libuuid
     libdrm

diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix
@@ -6,7 +6,7 @@
 , alsa-lib
 , freetype
 , libglvnd
-, mesa
+, libgbm
 , curl
 , libXcursor
 , libXinerama
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-    mesa
+    libgbm
   ] ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [

diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix
@@ -6,7 +6,7 @@
 , alsa-lib
 , freetype
 , libglvnd
-, mesa
+, libgbm
 , curl
 , libXcursor
 , libXinerama
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-    mesa
+    libgbm
   ] ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [

diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
@@ -22,7 +22,7 @@
 , libpulseaudio
 , at-spi2-core
 , libxkbcommon
-, mesa
+, libgbm
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
         systemd
         vivaldi-ffmpeg-codecs
         libxkbcommon
-        mesa
+        libgbm
       ];
     in
     ''

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
@@ -12,7 +12,7 @@
 , pango
 , cairo
 , libxkbcommon
-, mesa
+, libgbm
 , expat
 , alsa-lib
 , buildFHSEnv
@@ -59,7 +59,7 @@ let
       libdrm
       pango
       cairo
-      mesa
+      libgbm
       expat
       libxkbcommon
     ]) ++ (with pkgs.xorg; [

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
@@ -10,7 +10,7 @@
 , at-spi2-atk
 , autoPatchelfHook
 , alsa-lib
-, mesa
+, libgbm
 , nss
 , nspr
 , xorg
@@ -157,7 +157,7 @@ in
   ];
 
   buildInputs = [ libsecret libXScrnSaver libxshmfence ]
-    ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ];
+    ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 libgbm nss nspr systemd xorg.libxkbfile ];
 
   runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ];
 

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
@@ -26,7 +26,7 @@
 , libXxf86vm
 , makeWrapper
 , mbedtls_2
-, mesa
+, libgbm
 , nvidia_cg_toolkit
 , pkg-config
 , python3
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libv4l
     libxkbcommon
-    mesa
+    libgbm
     udev
   ];
 

diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
@@ -107,7 +107,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
   ])
   ++ lib.optionals waylandSupport (with pkgs; [
      wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
-     mesa # for libgbm
+     libgbm
   ])));
 
   inherit patches;

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, makeDesktopItem, fetchurl, unzip
 , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme
-, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon
+, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, libgbm, libxkbcommon
 }:
 
 stdenv.mkDerivation rec {
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver
     libuuid
     libdrm
-    mesa
+    libgbm
   ]);
 
   desktopItem = makeDesktopItem {

diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix
@@ -7,7 +7,7 @@
 , libX11
 , libXi
 , freetype
-, mesa
+, libgbm
 }:
 
 stdenv.mkDerivation rec {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     libX11
     libXi
     freetype
-    mesa
+    libgbm
   ];
 
   cmakeFlags = [

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
@@ -20,7 +20,7 @@
 , libepoxy
 , pixman
 , poppler
-, mesa
+, libgbm
 , lirc
 }:
 
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     pixman
     poppler
     lirc
-    mesa
+    libgbm
   ];
 
   makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ];

diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libdrm
     libxkbcommon
-    mesa
+    libgbm
     nspr
     nss
     pango

diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
-  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run,
+  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, libgbm, xvfb-run,
   fontconfig, freetype, xorg, qmake, python3, qttools, git
 }:
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     poppler_utils
     qtxmlpatterns
     qtsvg
-    mesa
+    libgbm
     freetype
     xorg.libXi
     xorg.libXrender

diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix
@@ -30,7 +30,7 @@
   libxshmfence,
   libGL,
   libappindicator-gtk3,
-  mesa,
+  libgbm,
   nspr,
   nss,
   pango,
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
           libxshmfence
           libGL
           libappindicator-gtk3
-          mesa
+          libgbm
           nspr
           nss
           pango

diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix
@@ -21,7 +21,7 @@
 , libunwind
 , libuuid
 , libxkbcommon
-, mesa
+, libgbm
 , nspr
 , nss
 , openssl
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
       gdk-pixbuf
       glib
       gtk3
-      mesa
+      libgbm
       nss
       nspr
       libdrm

diff --git a/pkgs/applications/misc/bloodhound/default.nix b/pkgs/applications/misc/bloodhound/default.nix
@@ -24,7 +24,7 @@
 , libxcb
 , libxkbcommon
 , libxshmfence
-, mesa
+, libgbm
 , nspr
 , nss
 , pango
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     libuuid
     libxcb
     libxkbcommon
-    mesa
+    libgbm
     nspr
     nss
     pango

diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix
@@ -11,7 +11,7 @@
 , libXrandr
 , libXxf86vm
 , makeDesktopItem
-, mesa
+, libgbm
 , pkg-config
 , stdenv
 }:
@@ -40,7 +40,7 @@ buildGoModule rec {
     libXinerama
     libXrandr
     libXxf86vm
-    mesa
+    libgbm
   ];
 
   nativeBuildInputs = [

diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -56,7 +56,7 @@ in buildFHSEnv {
     # Higan // TODO: "higan is not available for the x86_64 architecture"
 
     # Libretro
-    fluidsynth hidapi mesa libdrm
+    fluidsynth hidapi libgbm libdrm
 
     # MAME
     fontconfig SDL2_ttf

diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix
@@ -27,7 +27,7 @@
   libGL,
   libadwaita,
   libdrm,
-  mesa,
+  libgbm,
   pango,
   sqlite,
   udev,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     libGL
     libadwaita
     libdrm
-    mesa
+    libgbm
     pango
     sqlite
     udev