diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 0a08ebbaae73..b143fa271636 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -16,6 +16,7 @@
   zenity,
   luajit_2_1,
   libGL,
+  libX11,
 
   builderArgs,
 }:
@@ -56,6 +57,8 @@ buildDubPackage (
       dbus
       freetype
       SDL2
+      libGL
+      libX11
     ];
 
     dontUseCmakeConfigure = true;
diff --git a/pkgs/by-name/cr/cro-mag-rally/package.nix b/pkgs/by-name/cr/cro-mag-rally/package.nix
index 0cc55c3fb0f6..bce0efdf5515 100644
--- a/pkgs/by-name/cr/cro-mag-rally/package.nix
+++ b/pkgs/by-name/cr/cro-mag-rally/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   cmake,
   makeWrapper,
 }:
@@ -25,6 +26,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     SDL2
+    libGL
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index 532d78085e5d..d19399b2eb62 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -5,6 +5,7 @@
   SDL2,
   libpng,
   libjpeg,
+  libX11,
   glew,
   openal,
   scons,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     SDL2
     libpng
     libjpeg
+    libX11
     glew
     openal
     libmad
diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index 20cd5b2a058d..a5e97f26f2d5 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -8,6 +8,7 @@
   libvorbis,
   openal,
   SDL2,
+  libGL,
   zlib,
   versionCheckHook,
   gitUpdater,
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
+    libGL
     libopenmpt
     libvorbis
     openal
diff --git a/pkgs/by-name/na/nanosaur2/package.nix b/pkgs/by-name/na/nanosaur2/package.nix
index 6d53df9b414b..476524125e28 100644
--- a/pkgs/by-name/na/nanosaur2/package.nix
+++ b/pkgs/by-name/na/nanosaur2/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   cmake,
   makeWrapper,
   unstableGitUpdater,
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     SDL2
+    libGL
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix
index 167023a22f6a..d56ee11a81e7 100644
--- a/pkgs/by-name/ne/neverball/package.nix
+++ b/pkgs/by-name/ne/neverball/package.nix
@@ -7,6 +7,7 @@
   libGL,
   libpng,
   libjpeg,
+  libX11,
   SDL2_ttf,
   libvorbis,
   gettext,
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     libjpeg
     SDL2_ttf
     libvorbis
+    libX11
     gettext
     physfs
   ];
diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix
index 89359b898887..3081619b8e10 100644
--- a/pkgs/by-name/op/opensoldat/package.nix
+++ b/pkgs/by-name/op/opensoldat/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
     physfs
     openal
     gamenetworkingsockets
+    xorg.libX11
   ];
   # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook
   runtimeDependencies = [ xorg.libX11 ];
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 8d7889e772e4..6da58aeeb35d 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -13,6 +13,7 @@
   libpng,
   libsigcxx,
   libvorbis,
+  libX11,
   lua5_2,
   libgbm,
   SDL2,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     libpng
     libsigcxx
     libvorbis
+    libX11
     lua5_2
     libgbm
     SDL2
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index ad1372e45f98..e5fa5a314a0e 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -11,8 +11,10 @@
   curl,
   SDL2,
   openalSoft,
+  libGL,
   libogg,
   libvorbis,
+  libX11,
   libXi,
   wayland,
   wayland-protocols,
@@ -61,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: rec {
       libjpeg
       curl
       SDL2
+      libGL
       libogg
       libvorbis
+      libX11
       ffmpeg
       openalSoft
     ]
diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix
index 8a8e27fc7a28..42673516194a 100644
--- a/pkgs/by-name/sy/syncterm/package.nix
+++ b/pkgs/by-name/sy/syncterm/package.nix
@@ -8,6 +8,7 @@
   autoPatchelfHook,
   ncurses,
   SDL2,
+  libX11,
   alsa-lib,
 }:
 
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     pkg-config
     SDL2
+    libX11
     perl
     unzip
   ]; # SDL2 for `sdl2-config`.
diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix
index 0d976def8333..b4fe9e3022e4 100644
--- a/pkgs/by-name/vd/vdrift/package.nix
+++ b/pkgs/by-name/vd/vdrift/package.nix
@@ -10,6 +10,7 @@
   SDL2,
   SDL2_image,
   libvorbis,
+  libX11,
   bullet,
   curl,
   gettext,
@@ -49,6 +50,7 @@ let
       SDL2
       SDL2_image
       libvorbis
+      libX11
       bullet
       curl
       gettext
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 97bba1a68e7a..9d18dee80066 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -10,6 +10,7 @@
   git,
   SDL2,
   SDL2_ttf,
+  libX11,
   freetype,
   harfbuzz,
   ffmpeg,
@@ -65,6 +66,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
+    libX11
     SDL2_ttf
     freetype
     harfbuzz
diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix
index d54ae34dd0a3..434de05c90ce 100644
--- a/pkgs/by-name/vp/vpv/package.nix
+++ b/pkgs/by-name/vp/vpv/package.nix
@@ -4,9 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
+  libGL,
   libpng,
   libtiff,
   libjpeg,
+  libX11,
   SDL2,
   gdal,
   octave,
@@ -39,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libGL
     libpng
     libtiff
     libjpeg
+    libX11
     SDL2
     gdal
     octave
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix
index 3c47f02131c2..8d25bf7dc3d9 100644
--- a/pkgs/games/bugdom/default.nix
+++ b/pkgs/games/bugdom/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   IOKit,
   Foundation,
   OpenGL,
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       SDL2
+      libGL
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       IOKit
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index d580ef782896..24c33f9a0664 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -10,6 +10,7 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
+  libX11,
   freetype,
   zlib,
   debug,
@@ -31,6 +32,7 @@ let
     SDL2_image
     SDL2_mixer
     SDL2_ttf
+    libX11
     freetype
   ];
 
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index a802550e48bf..48e36f5d3990 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -8,6 +8,7 @@
   libmpg123,
   libopus,
   libvorbis,
+  libX11,
   makeWrapper,
   meson,
   moltenvk,
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmpg123
       libopus
       libvorbis
+      libX11
       opusfile
       vulkan-loader
     ]
diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
index 944827cdb062..e2c4e3bd020a 100644
--- a/pkgs/games/warsow/engine.nix
+++ b/pkgs/games/warsow/engine.nix
@@ -13,6 +13,7 @@
   libpng,
   SDL2,
   libGL,
+  libX11,
   openal,
   zlib,
 }:
@@ -52,6 +53,7 @@ stdenv.mkDerivation {
     libjpeg
     SDL2
     libGL
+    libX11
     openal
     zlib
     libpng