diff --git a/pkgs/by-name/bi/bionic-translation/package.nix b/pkgs/by-name/bi/bionic-translation/package.nix
index 9e22b92f86d7..28d6aafc38b9 100644
--- a/pkgs/by-name/bi/bionic-translation/package.nix
+++ b/pkgs/by-name/bi/bionic-translation/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  mesa,
   wayland,
   libglvnd,
   libbsd,
@@ -35,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
     libelf
     libglvnd
     libunwind
-    mesa
     wayland
   ];
 
diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix
index e0f629748379..e67c0a2749cd 100644
--- a/pkgs/by-name/ce/celestegame/package.nix
+++ b/pkgs/by-name/ce/celestegame/package.nix
@@ -88,7 +88,6 @@ buildFHSEnv {
       kdePackages.wayland
       libxkbcommon
       libgcc
-      mesa
       libdrm
       expat
       alsa-lib
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index e4ea8996db4d..1211555600ba 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -20,7 +20,6 @@
   nghttp2,
   openjpeg,
   libcaca,
-  mesa,
   mesa_glu,
   xvidcore,
   openssl,
@@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     libxv
     xorgproto
-    mesa
     mesa_glu
     xvidcore
     openssl
diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix
index 877fa35e238b..090a20d27575 100644
--- a/pkgs/by-name/gr/grayjay/package.nix
+++ b/pkgs/by-name/gr/grayjay/package.nix
@@ -7,6 +7,7 @@
   libz,
   icu,
   openssl,
+  libgbm,
   libxrandr,
   libxfixes,
   libxext,
@@ -28,7 +29,6 @@
   cairo,
   udev,
   alsa-lib,
-  mesa,
   libGL,
   libsecret,
   nix-update-script,
@@ -74,12 +74,12 @@ buildDotnetModule (finalAttrs: {
 
   buildInputs = [
     openssl
+    libgbm
     libgcc
     libx11
     gtk3
     glib
     alsa-lib
-    mesa
     nspr
     nss
     icu
diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index b337c74dd618..6499afde3626 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -23,7 +23,6 @@
   wayland-protocols,
   glew,
   qt6,
-  mesa,
   alsa-lib,
   sdl3,
   iniparser,
@@ -81,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     wayland-protocols
     glew
-    mesa
     alsa-lib
   ];
 
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 6103be6f22ff..874014e873d6 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libX11
     m4
-    mesa
     mesa_glu
     ncurses
     tcl
diff --git a/pkgs/by-name/qq/qqmusic/package.nix b/pkgs/by-name/qq/qqmusic/package.nix
index a87050b702cd..7460794d7129 100644
--- a/pkgs/by-name/qq/qqmusic/package.nix
+++ b/pkgs/by-name/qq/qqmusic/package.nix
@@ -21,7 +21,6 @@
   libdbusmenu,
   libglvnd,
   libpulseaudio,
-  mesa,
   nspr,
   nss,
   pango,
@@ -74,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     libdbusmenu
     libglvnd
     libpulseaudio
-    mesa
     nspr
     nss
     pango
diff --git a/pkgs/by-name/ro/rovium/package.nix b/pkgs/by-name/ro/rovium/package.nix
index 78d93a1b5818..5e8e90ee23b0 100644
--- a/pkgs/by-name/ro/rovium/package.nix
+++ b/pkgs/by-name/ro/rovium/package.nix
@@ -7,8 +7,8 @@
   wrapGAppsHook3,
   dpkg,
   alsa-lib,
-  mesa,
   gtk3,
+  libgbm,
   nss,
   libxkbfile,
   libsecret,
@@ -35,8 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    mesa
     gtk3
+    libgbm
     nss
     libxkbfile
     libsecret
diff --git a/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
index 1a85c258eb0e..61e8e39a5192 100644
--- a/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
@@ -5,7 +5,6 @@
   libGLU,
   libglut,
   libglvnd,
-  mesa,
 }:
 buildRedist {
   redistName = "cuda";
@@ -17,7 +16,6 @@ buildRedist {
     libGLU
     libglut
     libglvnd
-    mesa
   ];
 
   outputs = [ "out" ];
diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix
index 45f2292f9bfd..4a2ba3b92766 100644
--- a/pkgs/development/libraries/intel-oneapi/base.nix
+++ b/pkgs/development/libraries/intel-oneapi/base.nix
@@ -27,7 +27,6 @@
   gtk3,
   pango,
   cairo,
-  mesa,
   expat,
   libxkbcommon,
   eudev,
@@ -104,7 +103,6 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
       nss
       dbus
       cups
-      mesa
       expat
       libxkbcommon
       eudev
@@ -156,7 +154,6 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
       gtk3
       pango
       cairo
-      mesa
       expat
       libxkbcommon
       eudev