treewide: mesa -> libgbm (where appropriate)

This will likely break things, but anything broken should be easily noticeable.
2024-12-04 14:57:48 +03:00 · 2024-12-04 14:57:48 +03:00 · d209d800b7
commit d209d800b7
parent 844b566ebd
194 changed files with 384 additions and 386 deletions
--- 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
@ -159,7 +159,7 @@ in
  ];

  buildInputs = [ libsecret libXScrnSaver libxshmfence ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ];
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 libgbm nss nspr systemd xorg.libxkbfile ];

  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ];

--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@ -105,7 +105,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;
--- 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
--- 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
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@ -61,7 +61,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
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@ -9,7 +9,7 @@
 , libGLU
 , libICE
 , libX11
-, mesa
+, libgbm
 , perl
 , pkg-config
 , proj
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    # TODO: libGLU doesn't build for macOS because of Mesa issues
    # (#233265); is it required for anything?
    libGLU
-    mesa
+    libgbm
    libICE
    libX11
  ];
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@ -37,7 +37,7 @@
 , bison, gperf, libkrb5
 , glib, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL
-, mesa
+, libgbm
 , pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core
 , pipewire
 , libva
@ -246,8 +246,7 @@ let
      util-linux alsa-lib
      libkrb5
      glib gtk3 dbus-glib
-      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
-      mesa # required for libgbm
+      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm
      pciutils protobuf speechd-minimal libXdamage at-spi2-core
      pipewire
      libva
@ -274,8 +273,7 @@ let
      util-linux alsa-lib
      libkrb5
      glib gtk3 dbus-glib
-      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
-      mesa # required for libgbm
+      libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm
      pciutils protobuf speechd-minimal libXdamage at-spi2-core
      pipewire
      libva
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@ -12,7 +12,7 @@
 , udev
 , libkrb5
 , libva
-, mesa # firefox wants gbm for drm+dmabuf
+, libgbm
 , cups
 , pciutils
 , vulkan-loader
@ -87,7 +87,7 @@ let
       );

       libs = lib.optionals stdenv.hostPlatform.isLinux (
-            [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]
+            [ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]
            ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
       )
            ++ lib.optional pipewireSupport pipewire
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -6,7 +6,7 @@
 , libxml2
 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core
 , qt5
-, libdrm, mesa
+, libdrm, libgbm
 , vulkan-loader
 , nss, nspr
 , patchelf, makeWrapper
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
    qt5.qtbase
    freetype fontconfig libXrender libuuid expat glib nss nspr libGL
    libxml2 pango cairo
-    libdrm mesa vulkan-loader
+    libdrm libgbm vulkan-loader
    wayland pipewire
  ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
    ++ lib.optional pulseSupport libpulseaudio
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -46,7 +46,7 @@ buildFHSEnv {
    libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
    libXxf86vm libGL libxcb xkeyboardconfig
    curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
-    procps zlib mesa libxshmfence libpthreadstubs libappindicator
+    procps zlib libgbm libxshmfence libpthreadstubs libappindicator
  ];

  extraInstallCommands = ''
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@ -43,7 +43,7 @@
  libXtst,
  libxcb,
  libxshmfence,
-  mesa,
+  libgbm,
  nspr,
  nss,
  pango,
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
    libXtst
    libxcb
    libxshmfence
-    mesa
+    libgbm
    nss
    wrapGAppsHook3
    makeShellWrapper
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
      systemd
      libpulseaudio
      libdrm
-      mesa
+      libgbm
      stdenv.cc.cc
      alsa-lib
      atk
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@ -22,7 +22,7 @@
 , udev
 , libnotify
 , xdg-utils
-, mesa
+, libgbm
 , libglvnd
 , libappindicator-gtk3
 }:
@ -52,7 +52,7 @@ in stdenv.mkDerivation (rec {
    libXtst
    libXScrnSaver
  ]) ++ [
-    mesa #libgbm
+    libgbm
    gtk3
    atk
    glib
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@ -28,7 +28,7 @@
 , libxcb
 , libxkbcommon
 , libxshmfence
-, mesa
+, libgbm
 , nspr
 , nss
 , pango
@ -117,7 +117,7 @@ let
      libuuid
      libxcb
      libxkbcommon
-      mesa
+      libgbm
      nspr
      nss
      pango
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
@ -19,7 +19,7 @@
 , libnotify
 , libpulseaudio
 , libxkbcommon
-, mesa
+, libgbm
 , nss
 , udev
 , xorg
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    libnotify
    libpulseaudio
    libxkbcommon
-    mesa
+    libgbm
    nss
    xorg.libX11
    xorg.libXScrnSaver
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@ -24,7 +24,7 @@
  glib,
  abseil-cpp,
  pipewire,
-  mesa,
+  libgbm,
  libdrm,
  libGL,
  apple-sdk_15,
@ -47,7 +47,7 @@ stdenv.mkDerivation {
    substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
      --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
      --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \
-      --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \
+      --replace-fail '"libgbm.so.1"' '"${lib.getLib libgbm}/lib/libgbm.so.1"' \
      --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"'
  '';

@ -85,7 +85,7 @@ stdenv.mkDerivation {
      libXi
      glib
      pipewire
-      mesa
+      libgbm
      libdrm
      libGL
    ]
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@ -1,7 +1,7 @@
 { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
 , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
-, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
+, gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
 , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
 , libfaketime
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
    libvorbis
    libxml2
    llvmPackages_12.libunwind
-    mesa
+    libgbm
    nspr
    nss
    opencv4'
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
-, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }:
+, asar, alsa-lib, gtk3, libxshmfence, libgbm, nss }:

 stdenv.mkDerivation rec {
  pname = "morgen";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    asar
  ];

-  buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
+  buildInputs = [ alsa-lib gtk3 libxshmfence libgbm nss ];

  installPhase = ''
    runHook preInstall
--- a/pkgs/applications/office/trilium/desktop.nix
+++ b/pkgs/applications/office/trilium/desktop.nix
@ -1,6 +1,6 @@
 { stdenv, lib, unzip, autoPatchelfHook
 , fetchurl, makeWrapper
-, alsa-lib, mesa, nss, nspr, systemd
+, alsa-lib, libgbm, nss, nspr, systemd
 , makeDesktopItem, copyDesktopItems, wrapGAppsHook3
 , metaCommon
 }:
@ -35,7 +35,7 @@ let

    buildInputs = [
      alsa-lib
-      mesa
+      libgbm
      nss
      nspr
      stdenv.cc.cc
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@ -7,7 +7,7 @@
 , libtool
 , libxkbcommon
 , nspr
-, mesa
+, libgbm
 , libtiff
 , udev
 , gtk3
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
    libjpeg
    libxkbcommon
    nspr
-    mesa
+    libgbm
    libtiff
    udev
    gtk3
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@ -18,7 +18,7 @@
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
 , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
-, lirc
+, lirc, mesa
 , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
 , dbusSupport ? true, dbus
 , joystickSupport ? true, cwiid
@ -33,7 +33,7 @@
 , vdpauSupport ? true, libvdpau
 , waylandSupport ? false, wayland, wayland-protocols
 , waylandpp ?  null, libxkbcommon
-, gbmSupport ? false, mesa, libinput, libdisplay-info
+, gbmSupport ? false, libgbm, libinput, libdisplay-info
 , buildPackages
 }:

@ -151,7 +151,7 @@ in stdenv.mkDerivation (finalAttrs: {
    ]
    ++ lib.optionals gbmSupport [
      libxkbcommon.dev
-      mesa.dev
+      libgbm
      libinput.dev
      libdisplay-info
    ];
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@ -39,7 +39,7 @@
  libxkbcommon,
  lua,
  makeWrapper,
-  mesa,
+  libgbm,
  meson,
  mujs,
  ninja,
@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals cmsSupport [ lcms2 ]
    ++ lib.optionals drmSupport [
      libdrm
-      mesa
+      libgbm
    ]
    ++ lib.optionals dvdnavSupport [
      libdvdnav
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@ -20,7 +20,7 @@
 , gtk3-x11
 , libudev0-shim
 , libuuid
-, mesa
+, libgbm
 , nss
 , nspr
 , xorg
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
    glib
    pango
    gtk3-x11
-    mesa
+    libgbm
    nss
    nspr
    libuuid
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -22,7 +22,7 @@
 , xenSupport ? false, xen
 , cephSupport ? false, ceph
 , glusterfsSupport ? false, glusterfs, libuuid
-, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm
+, openGLSupport ? sdlSupport, libgbm, libepoxy, libdrm
 , rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx
 , virglSupport ? openGLSupport, virglrenderer
 , libiscsiSupport ? !minimal, libiscsi
@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals xenSupport [ xen ]
    ++ lib.optionals cephSupport [ ceph ]
    ++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
-    ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]
+    ++ lib.optionals openGLSupport [ libgbm libepoxy libdrm ]
    ++ lib.optionals rutabagaSupport [ rutabaga_gfx ]
    ++ lib.optionals virglSupport [ virglrenderer ]
    ++ lib.optionals libiscsiSupport [ libiscsi ]
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@ -13,7 +13,7 @@
  hyprutils,
  hyprwayland-scanner,
  libdrm,
-  mesa,
+  libgbm,
  pipewire,
  qtbase,
  qttools,
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
    hyprlang
    hyprutils
    libdrm
-    mesa
+    libgbm
    pipewire
    qtbase
    qttools
--- a/pkgs/applications/window-managers/sommelier/default.nix
+++ b/pkgs/applications/window-managers/sommelier/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchzip
 , meson, ninja, pkg-config, python3, python3Packages, wayland-scanner
-, libxkbcommon, mesa, pixman, xorg, wayland, gtest
+, libxkbcommon, libgbm, pixman, xorg, wayland, gtest
 }:

 stdenv.mkDerivation {
@ -17,7 +17,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    meson ninja pkg-config python3 python3Packages.jinja2 wayland-scanner
  ];
-  buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ];
+  buildInputs = [ libxkbcommon libgbm pixman wayland xorg.libxcb ];

  preConfigure = ''
    patchShebangs gen-shim.py
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@ -160,7 +160,7 @@ rec {
      libidn
      tbb
      wayland
-      mesa
+      libgbm
      libxkbcommon
      vulkan-loader

--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@ -9,7 +9,7 @@
 , pcre
 , gtkmm4
 , pugixml
-, mesa
+, libgbm
 , pciutils
 }:

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml mesa pciutils ];
+  buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml libgbm pciutils ];

  cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ];

--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.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 [
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3
 , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL
 , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon
-, mesa, openssl, systemd, xorg }:
+, libgbm, openssl, systemd, xorg }:

 stdenv.mkDerivation rec {
  pname = "alfaview";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    libsecret
    libtiff
    libxkbcommon
-    mesa
+    libgbm
    openssl
    stdenv.cc.cc
    systemd
--- a/pkgs/by-name/ap/appgate-sdp/package.nix
+++ b/pkgs/by-name/ap/appgate-sdp/package.nix
@ -25,7 +25,7 @@
 , libxkbcommon
 , lttng-ust
 , makeWrapper
-, mesa
+, libgbm
 , networkmanager
 , nspr
 , nss
@ -61,7 +61,7 @@ let
    libxcb
    libxkbcommon
    lttng-ust
-    mesa
+    libgbm
    nspr
    nss
    openssl
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@ -11,7 +11,7 @@
  libffi,
  libGL,
  libinput,
-  mesa,
+  libgbm,
  nix-update-script,
  pixman,
  pkg-config,
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    libffi
    libGL
    libinput
-    mesa
+    libgbm
    pixman
    seatd
    udev
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@ -29,7 +29,7 @@
  libxcb,
  libxkbcommon,
  makeWrapper,
-  mesa,
+  libgbm,
  mupdf,
  openal,
  openjpeg,
@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
    libvncserver
    libxcb
    libxkbcommon
-    mesa
+    libgbm
    mupdf
    openal
    openjpeg
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@ -9,7 +9,7 @@
 , libGL
 , libinput
 , libxkbcommon
-, mesa
+, libgbm
 , seatd
 , wayland
 }:
@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
    libGL
    libinput
    libxkbcommon
-    mesa
+    libgbm
    seatd
    systemd
    wayland
--- a/pkgs/by-name/av/avocode/package.nix
+++ b/pkgs/by-name/av/avocode/package.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 {
--- a/pkgs/by-name/az/azuredatastudio/package.nix
+++ b/pkgs/by-name/az/azuredatastudio/package.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
--- a/pkgs/by-name/bl/bloodhound/package.nix
+++ b/pkgs/by-name/bl/bloodhound/package.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
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@ -10,7 +10,7 @@
 , nss
 , libXdamage
 , libdrm
-, mesa
+, libgbm
 , libxshmfence
 , makeDesktopItem
 , makeWrapper
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
    nss
    libXdamage
    libdrm
-    mesa
+    libgbm
    libxshmfence
    udev
  ];
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, mesa }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, libgbm }:

 stdenv.mkDerivation rec {
  pname = "blur-effect";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    gdk-pixbuf
    libGL
-    mesa
+    libgbm
  ];

  meta = with lib; {
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@ -37,7 +37,7 @@
  libuuid,
  libxkbcommon,
  libxshmfence,
-  mesa,
+  libgbm,
  nspr,
  nss,
  pango,
@ -125,7 +125,7 @@ let
    libxshmfence
    libXtst
    libuuid
-    mesa
+    libgbm
    nspr
    nss
    pango
--- a/pkgs/by-name/br/brlcad/package.nix
+++ b/pkgs/by-name/br/brlcad/package.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 = [
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@ -24,7 +24,7 @@
  libuuid,
  libwnck,
  magpie,
-  mesa,
+  libgbm,
  meson,
  mutter,
  ninja,
@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
    libuuid
    libwnck
    magpie
-    mesa
+    libgbm
    polkit
    sassc
    upower
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@ -72,7 +72,7 @@ buildFHSEnv {
      libdrm
      udev
      libxkbcommon
-      mesa
+      libgbm
      nspr
      nss
      pango
--- a/pkgs/by-name/ca/cardboard/package.nix
+++ b/pkgs/by-name/ca/cardboard/package.nix
@ -12,7 +12,7 @@
 , libpng
 , libxcb
 , libxkbcommon
-, mesa
+, libgbm
 , meson
 , ninja
 , pandoc
@ -93,7 +93,7 @@ stdenv.mkDerivation {
    libpng
    libxcb
    libxkbcommon
-    mesa
+    libgbm
    pixman
    wayland
    wayland-protocols
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon-common/package.nix
@ -23,7 +23,7 @@
 , libstartup_notification
 , libXtst
 , libXdamage
-, mesa
+, libgbm
 , muffin
 , networkmanager
 , pkg-config
@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
    libstartup_notification
    libXtst
    libXdamage
-    mesa
+    libgbm
    muffin
    networkmanager
    polkit
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.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 = [
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@ -8,7 +8,7 @@
 , libinput
 , libglvnd
 , libxkbcommon
-, mesa
+, libgbm
 , seatd
 , udev
 , xwayland
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
      libglvnd
      libinput
      libxkbcommon
-      mesa
+      libgbm
      pixman
      seatd
      udev
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@ -12,7 +12,7 @@
  libinput,
  fontconfig,
  freetype,
-  mesa,
+  libgbm,
  wayland,
  xorg,
  vulkan-loader,
@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
    libglvnd
    fontconfig
    freetype
-    mesa
+    libgbm
    wayland
    vulkan-loader
  ];
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@ -5,7 +5,7 @@
 , libxkbcommon
 , libinput
 , libglvnd
-, mesa
+, libgbm
 , udev
 , wayland
 }:
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
  separateDebugInfo = true;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libxkbcommon libinput libglvnd mesa udev wayland ];
+  buildInputs = [ libxkbcommon libinput libglvnd libgbm udev wayland ];

  postInstall = ''
    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
--- a/pkgs/by-name/dy/dyalog/package.nix
+++ b/pkgs/by-name/dy/dyalog/package.nix
@ -17,7 +17,7 @@
 , gtk3
 , libdrm
 , libGL
-, mesa
+, libgbm
 , nss
 , htmlRendererSupport ? false

@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    libdrm
    libGL
-    mesa
+    libgbm
    nss
  ]
  ++ lib.optional sqaplSupport unixODBC;
--- a/pkgs/by-name/el/electron-fiddle/package.nix
+++ b/pkgs/by-name/el/electron-fiddle/package.nix
@ -126,7 +126,7 @@ buildFHSEnv {
      libdrm
      libnotify
      libxkbcommon
-      mesa
+      libgbm
      nspr
      nss
      pango
--- a/pkgs/by-name/en/enpass/package.nix
+++ b/pkgs/by-name/en/enpass/package.nix
@ -2,7 +2,7 @@
 , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype
 , gtk3, pango
 , makeWrapper , python3Packages, lib, libcap
-, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon
+, lsof, curl, libuuid, cups, libgbm, xz, libxkbcommon
 }:

 let
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@ -34,7 +34,7 @@ buildFHSEnv {
        ++ pkgs.monado.nativeBuildInputs
        ++ (with pkgs; [
          # Additional dependencies required by Monado when built using Envision
-          mesa
+          libgbm
          shaderc
          xorg.libX11
          xorg.libxcb
--- a/pkgs/by-name/eu/eudic/package.nix
+++ b/pkgs/by-name/eu/eudic/package.nix
@ -21,7 +21,7 @@
 , nss
 , libgpg-error
 , libjack2
-, mesa
+, libgbm
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
    nss
    libgpg-error
    libjack2
-    mesa
+    libgbm
  ];

  unpackPhase = ''
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@ -23,7 +23,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
    ''
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.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" ];
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@ -45,7 +45,7 @@
 , libxkbfile
 , libxshmfence
 , makeShellWrapper
-, mesa
+, libgbm
 , nspr
 , nss
 , pango
@ -117,7 +117,7 @@ let
    libxkbcommon
    libxkbfile
    libxshmfence
-    mesa
+    libgbm
    nspr
    nss
    pango
@ -155,7 +155,7 @@ stdenv.mkDerivation {
    libgcrypt
    libpulseaudio
    libxshmfence
-    mesa
+    libgbm
    nspr
    nss
  ];
--- a/pkgs/by-name/fi/figma-linux/package.nix
+++ b/pkgs/by-name/fi/figma-linux/package.nix
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    libdrm
    libxkbcommon
-    mesa
+    libgbm
    nspr
    nss
    pango
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@ -15,7 +15,7 @@
  libnotify,
  libpulseaudio,
  libva,
-  mesa,
+  libgbm,
  nixosTests,
  openssl,
  pciutils,
@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
          libnotify
          libpulseaudio
          libva
-          mesa
+          libgbm
          pciutils
          pipewire
          udev
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@ -2,7 +2,7 @@
 , fetchzip
 , fetchFromGitHub
 , imagemagick
-, mesa
+, libgbm
 , libdrm
 , flutter324
 , pulseaudio
@ -14,7 +14,7 @@
 }:

 let
-  libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ];
+  libwebrtcRpath = lib.makeLibraryPath [ libgbm libdrm ];
  pubspecLock = lib.importJSON ./pubspec.lock.json;
 in
 flutter324.buildFlutterApplication (rec {
--- a/pkgs/by-name/fo/forge/package.nix
+++ b/pkgs/by-name/fo/forge/package.nix
@ -10,7 +10,7 @@
 , lib
 , libGLU
 , libGL
-, mesa
+, libgbm
 , opencl-clhpp
 , pkg-config
 , stdenv
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
    libGLU
    opencl-clhpp
    SDL2
-    mesa
+    libgbm
  ];

  meta = with lib; {
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@ -13,7 +13,7 @@
 , libdrm
 , alsa-lib
 , cups
-, mesa
+, libgbm
 , systemd
 , openssl
 , libglvnd
@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    libdrm
    alsa-lib
    cups
-    mesa
+    libgbm
    openssl
  ];

--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@ -44,7 +44,7 @@
  e2fsprogs,
  krb5,
  libdrm,
-  mesa,
+  libgbm,
  unzip,
  copyDesktopItems,
  libxshmfence,
@ -145,7 +145,7 @@ let
      e2fsprogs
      krb5
      libdrm
-      mesa
+      libgbm
      libxshmfence
      libxkbcommon
      libGL
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@ -14,7 +14,7 @@
 , udev
 , wayland
 , wayland-protocols
-, mesa
+, libgbm
 }:

 stdenv.mkDerivation rec {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    udev
    wayland
    wayland-protocols
-    mesa
+    libgbm
  ];

  mesonFlags = [ "-Dflavors=drm-gl,drm-glesv2,gbm-gl,gbm-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-gl-egl,x11-glesv2" ];
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@ -58,7 +58,7 @@
  gnome-autoar,
  gnome-tecla,
  bash-completion,
-  mesa,
+  libgbm,
  libGL,
  libXi,
  libX11,
@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
    ibus
    gnome-desktop
    gnome-settings-daemon
-    mesa
+    libgbm
    libGL # for egl, required by mutter-clutter
    libXi # required by libmutter
    libX11
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@ -39,7 +39,7 @@
  libXScrnSaver,
  libxshmfence,
  libXtst,
-  mesa,
+  libgbm,
  nspr,
  nss,
  pango,
@ -142,7 +142,7 @@ let
      libXScrnSaver
      libxshmfence
      libXtst
-      mesa
+      libgbm
      nspr
      nss
      opusWithCustomModes
--- a/pkgs/by-name/hy/hyper/package.nix
+++ b/pkgs/by-name/hy/hyper/package.nix
@ -2,14 +2,14 @@
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr
 , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence
-, libdrm, libxkbcommon, mesa, nixosTests}:
+, libdrm, libxkbcommon, libgbm, nixosTests}:

 let
  libPath = lib.makeLibraryPath [
    stdenv.cc.cc gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
    libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio
-    at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa
+    at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon libgbm
  ];

 in
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@ -23,7 +23,7 @@
  libinput,
  libuuid,
  libxkbcommon,
-  mesa,
+  libgbm,
  pango,
  pciutils,
  pkgconf,
@ -145,7 +145,7 @@ customStdenv.mkDerivation (finalAttrs: {
      libinput
      libuuid
      libxkbcommon
-      mesa
+      libgbm
      pango
      pciutils
      tomlplusplus
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@ -20,7 +20,7 @@
  libwebp,
  pango,
  libdrm,
-  mesa,
+  libgbm,
  nix-update-script,
 }:

@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
    libjpeg
    libwebp
    libxkbcommon
-    mesa
+    libgbm
    pam
    pango
    sdbus-cpp_2
--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@ -28,7 +28,7 @@ appimageTools.wrapAppImage rec {
      libgpg-error
      fontconfig
      libGL
-      mesa
+      libgbm
      wayland
      pipewire
      fribidi
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@ -4,7 +4,7 @@
 , libGL
 , libinput
 , libxkbcommon
-, mesa
+, libgbm
 , pango
 , udev
 , shaderc
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [
    libGL
    libxkbcommon
-    mesa
+    libgbm
    pango
    udev
    libinput
--- a/pkgs/by-name/jo/jogl/package.nix
+++ b/pkgs/by-name/jo/jogl/package.nix
@ -9,7 +9,7 @@
 , xcbuild
 , udev
 , xorg
-, mesa
+, libgbm
 , darwin
 , coreutils
 }:
@ -80,7 +80,7 @@ stdenv.mkDerivation {
    xorg.libXt
    xorg.libXxf86vm
    xorg.libXrender
-    mesa
+    libgbm
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk_11_0.frameworks.AppKit
    darwin.apple_sdk_11_0.frameworks.Cocoa
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@ -13,7 +13,7 @@
  nss,
  udev,
  gnome-keyring,
-  mesa,
+  libgbm,
  gtk3,
  libusb1,
  libsecret,
@ -63,7 +63,7 @@ let
    libXtst
    libxshmfence
    gnome-keyring
-    mesa
+    libgbm
    gtk3
    libusb1
    libsecret
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@ -14,7 +14,7 @@
 , pkg-config
 , docbook_xsl
 , libxslt
-, mesa
+, libgbm
 , ninja
 , buildPackages
 }:
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    pango
    pixman
    systemd
-    mesa
+    libgbm
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@ -41,7 +41,7 @@
  libXcomposite,
  libXdamage,
  libXfixes,
-  mesa,
+  libgbm,
  gtk3,
  pango,
  cairo,
@ -73,7 +73,7 @@ let
    libXext
    libXfixes
    libXrandr
-    mesa
+    libgbm
    gtk3
    pango
    cairo
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@ -12,7 +12,7 @@
 , libX11
 , libXcursor
 , libxkbcommon
-, mesa
+, libgbm
 , pixman
 , seatd
 , srm-cuarzo
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    libX11
    libXcursor
    libxkbcommon
-    mesa
+    libgbm
    pixman
    seatd
    srm-cuarzo
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@ -32,7 +32,7 @@
  pipewire,
  libgudev,
  libwacom,
-  mesa,
+  libgbm,
  meson,
  nix-update-script,
  validatePkgConfig,
@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
    desktop-file-utils
    gettext
    libxcvt
-    mesa # needed for gbm
+    libgbm
    meson
    ninja
    xvfb-run
--- a/pkgs/by-name/ma/mailspring/linux.nix
+++ b/pkgs/by-name/ma/mailspring/linux.nix
@ -18,7 +18,7 @@
 , openssl
 , udev
 , xorg
-, mesa
+, libgbm
 , libdrm
 , libappindicator
 }:
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    xorg.libXScrnSaver
    xorg.libXtst
    xorg.libxshmfence
-    mesa
+    libgbm
    libdrm
  ];

--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, autoPatchelfHook
-, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib
+, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, libgbm, wayland, xz, zlib
 , libva, libvdpau, addDriverRunpath
 }:

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoPatchelfHook ];

  buildInputs = [
-    alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb mesa wayland xz zlib
+    alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb libgbm wayland xz zlib
  ];

  appendRunpaths = lib.makeLibraryPath [
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@ -38,7 +38,7 @@
  libXScrnSaver,
  libxshmfence,
  libXtst,
-  mesa,
+  libgbm,
  nspr,
  nss,
  pango,
@ -142,7 +142,7 @@ let
      libXScrnSaver
      libxshmfence
      libXtst
-      mesa
+      libgbm
      nspr
      nss
      opusWithCustomModes
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@ -16,7 +16,7 @@
  libnotify,
  libuuid,
  libxkbcommon,
-  mesa,
+  libgbm,
  mir,
  nlohmann_json,
  pcre2,
@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
    libnotify
    libuuid
    libxkbcommon
-    mesa # gbm.h
+    libgbm
    mir
    nlohmann_json
    pcre2
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@ -31,7 +31,7 @@
  libGL,
  libadwaita,
  libdrm,
-  mesa,
+  libgbm,
  pango,
  sqlite,
  udev,
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
    libGL
    libadwaita
    libdrm
-    mesa
+    libgbm
    pango
    sqlite
    udev
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@ -23,7 +23,7 @@
  libuuid,
  libxcb,
  libxkbcommon,
-  mesa,
+  libgbm,
  nspr,
  nss,
  pango,
@ -58,7 +58,7 @@ let
    libuuid
    libxcb
    libxkbcommon
-    mesa
+    libgbm
    nspr
    nss
    pango
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@ -23,7 +23,7 @@
 , libXdamage
 , libxkbcommon
 , libXtst
-, mesa
+, libgbm
 , meson
 , ninja
 , pipewire
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    desktop-file-utils
-    mesa # needed for gbm
+    libgbm
    meson
    ninja
    pkg-config
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@ -25,7 +25,7 @@
 , libXrender
 , libXt
 , libXtst
-, mesa
+, libgbm
 , pango
 , pciutils
 , zlib
@ -77,7 +77,7 @@ let
      libXrender
      libXt
      libXtst
-      mesa # for libgbm
+      libgbm
      pango
      pciutils
      stdenv.cc.cc
--- a/pkgs/by-name/mu/mullvad-vpn/package.nix
+++ b/pkgs/by-name/mu/mullvad-vpn/package.nix
@ -17,7 +17,7 @@
  nspr,
  nss,
  gtk3,
-  mesa,
+  libgbm,
  libGL,
  wayland,
  xorg,
@ -48,7 +48,7 @@ let
    gtk3
    libappindicator
    libnotify
-    mesa
+    libgbm
    xorg.libX11
    xorg.libXScrnSaver
    xorg.libXcomposite
--- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix
+++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
@ -16,7 +16,7 @@
 , libdrm
 , libudev0-shim
 , libxkbcommon
-, mesa
+, libgbm
 , nspr
 , nss
 , pango
@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec {
    gtk3
    libdrm
    libxkbcommon
-    mesa
+    libgbm
    nspr
    nss
    pango
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@ -50,7 +50,7 @@
  libwacom,
  libSM,
  xwayland,
-  mesa,
+  libgbm,
  meson,
  gnome-settings-daemon,
  xorgserver,
@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
    desktop-file-utils
    gettext
    libxcvt
-    mesa # needed for gbm
+    libgbm
    meson
    ninja
    xvfb-run
--- a/pkgs/by-name/mu/mutter43/package.nix
+++ b/pkgs/by-name/mu/mutter43/package.nix
@ -32,7 +32,7 @@
  libgudev,
  libwacom,
  xwayland,
-  mesa,
+  libgbm,
  meson,
  gnome-settings-daemon,
  xorgserver,
@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
    desktop-file-utils
    gettext
    libxcvt
-    mesa # needed for gbm
+    libgbm
    meson
    ninja
    xvfb-run
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@ -8,7 +8,7 @@
 , ffmpeg
 , gnutls
 , libjpeg_turbo
-, mesa
+, libgbm
 , pixman
 , zlib
 }:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    ffmpeg
    gnutls
    libjpeg_turbo
-    mesa
+    libgbm
    pixman
    zlib
  ];
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@ -7,7 +7,7 @@
  libglvnd,
  libinput,
  libxkbcommon,
-  mesa,
+  libgbm,
  nix-update-script,
  pango,
  pipewire,
@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
      libglvnd # For libEGL
      libinput
      libxkbcommon
-      mesa # For libgbm
+      libgbm
      pango
      seatd
      wayland # For libwayland-client
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@ -26,7 +26,7 @@
  libudev0-shim,
  libdrm,
  makeWrapper,
-  mesa,
+  libgbm,
  noto-fonts-cjk-sans,
  nspr,
  nss,
@ -99,7 +99,7 @@ let
      libdrm
      nspr
      nss
-      mesa # libgbm
+      libgbm
      qt5.qtbase
      qt5.qtdeclarative
      qt5.qtsvg
--- a/pkgs/by-name/op/opera/package.nix
+++ b/pkgs/by-name/op/opera/package.nix
@ -31,7 +31,7 @@
 , libpulseaudio
 , libuuid
 , libxshmfence
-, mesa
+, libgbm
 , nspr
 , nss
 , pango
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
    libuuid
    libxcb
    libxshmfence
-    mesa
+    libgbm
    nspr
    nss
    pango
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@ -13,7 +13,7 @@
 , libsigcxx
 , libvorbis
 , lua5_2
-, mesa
+, libgbm
 , SDL2
 , SDL2_image
 }:
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    libsigcxx
    libvorbis
    lua5_2
-    mesa
+    libgbm
    SDL2
    SDL2_image
  ];
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@ -17,7 +17,7 @@
 , libnotify
 , libsForQt5
 , libxkbcommon
-, mesa
+, libgbm
 , nspr
 , nss
 , openssl
@ -42,7 +42,7 @@ stdenv.mkDerivation rec  {

  passthru.updateScript = ./update.sh;

-  nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract mesa ];
+  nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract libgbm ];

  buildInputs = [
    alsa-lib
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@ -38,7 +38,7 @@
 , libnghttp2
 , gsettings-desktop-schemas
 , libdrm
-, mesa
+, libgbm
 }:


@ -54,7 +54,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libdrm
-    mesa
+    libgbm
    gsettings-desktop-schemas
    glib
    gtk3
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@ -11,7 +11,7 @@
  libglvnd,
  libxkbcommon,
  makeShellWrapper,
-  mesa,
+  libgbm,
  musl,
  nss,
  patchelf,
@ -44,7 +44,7 @@ stdenv.mkDerivation {
      gtk3
      libglvnd
      libxkbcommon
-      mesa
+      libgbm
      musl
      nss
      stdenv.cc.cc
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@ -36,7 +36,7 @@
 , libXScrnSaver
 , libxkbcommon
 , libdrm
-, mesa
+, libgbm
 # It's unknown which version of openssl that postman expects but it seems that
 # OpenSSL 3+ seems to work fine (cf.
 # https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
    gtk3
    freetype
    fontconfig
-    mesa
+    libgbm
    nss
    nspr
    pango
--- a/pkgs/by-name/pr/premid/package.nix
+++ b/pkgs/by-name/pr/premid/package.nix
@ -3,7 +3,7 @@
 , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
 , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
-, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
+, libgbm, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
 }:

 stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    libXtst
    libxcb
    libxshmfence
-    mesa
+    libgbm
    nss
  ];

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
  dontConfigure = true;

  libPath = lib.makeLibraryPath [
-    libcxx systemd libpulseaudio libdrm mesa
+    libcxx systemd libpulseaudio libdrm libgbm
    stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
    gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
    libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@ -15,7 +15,7 @@
 , glib
 , gtk3
 , libsecret
-, mesa
+, libgbm
 , nss
 , pango
 , udev
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    glib
    gtk3
    libsecret
-    mesa
+    libgbm
    nss
    pango
    xorg.libX11
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@ -14,7 +14,7 @@
 , gdk-pixbuf
 , glib
 , gtk3
-, mesa
+, libgbm
 , nss
 , nspr
 , xorg
@ -55,7 +55,7 @@ let
    glib
    gtk3
    libsecret
-    mesa
+    libgbm
    nss
    nspr
    libdrm
--- a/Show More
+++ b/Show More