diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 57848bcb2b69..5d10db730f4f 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -7,6 +7,7 @@
   perl,
   pkg-config,
   SDL2,
+  libX11,
   libXext,
   Cocoa,
   utf8proc,
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       SDL2
+      libX11
       utf8proc
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix
index d65389d917e2..14efdb52adcc 100644
--- a/pkgs/applications/editors/libresprite/default.nix
+++ b/pkgs/applications/editors/libresprite/default.nix
@@ -15,6 +15,7 @@
   libpng,
   libwebp,
   libarchive,
+  libX11,
   pixman,
   tinyxml-2,
   zlib,
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       libpng
       libwebp
       libarchive
+      libX11
       pixman
       tinyxml-2
       zlib
diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix
index e0ca7b306f4e..4457c9b88c79 100644
--- a/pkgs/applications/graphics/vengi-tools/default.nix
+++ b/pkgs/applications/graphics/vengi-tools/default.nix
@@ -20,6 +20,7 @@
   libjpeg,
   libuuid,
   libuv,
+  libX11,
   lua5_4,
   lzfse,
   opencl-headers,
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
       lua5_4
       lzfse
       SDL2
+      libX11
       SDL2_mixer
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index b0147b551828..482a692d164a 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -9,6 +9,7 @@
   harfbuzz,
   libogg,
   libwebp,
+  libX11,
   mpg123,
   opusfile,
   SDL2,
@@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       harfbuzz
       libogg
       libwebp
+      libX11
       mpg123
       opusfile
       SDL2
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 512f839244f1..458cbb3ce673 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -4,6 +4,7 @@
   autoreconfHook,
   fetchFromGitHub,
   libGLU,
+  libX11,
   pkg-config,
   stdenv,
 }:
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGLU
+    libX11
     SDL2
   ];
 
diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix
index fe6d3059c172..8fccc5b7a317 100644
--- a/pkgs/by-name/dh/dhewm3/package.nix
+++ b/pkgs/by-name/dh/dhewm3/package.nix
@@ -10,6 +10,7 @@
   libjpeg,
   libogg,
   libvorbis,
+  libX11,
   openal,
   curl,
   copyDesktopItems,
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
     SDL2
     libGLU
     libGL
+    libX11
     zlib
     libjpeg
     libogg
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index a9b1b93c2041..c5d7ef2b9235 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -15,6 +15,7 @@
   libogg,
   libpng,
   libtheora,
+  libX11,
   lua5_4,
   minizip,
   openal,
@@ -62,6 +63,7 @@ stdenv.mkDerivation {
     libogg
     libpng
     libtheora
+    libX11
     lua5_4
     minizip
     openal
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index 8e09f58bf632..e45036f33570 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -9,6 +9,7 @@
   libjpeg,
   libGLU,
   libGL,
+  libX11,
   libsndfile,
   libXxf86vm,
   pcre,
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     libsndfile
+    libX11
     libXxf86vm
     pcre
     SDL2
diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix
index de73d4b4480e..da5906e6278a 100644
--- a/pkgs/by-name/fl/flex-launcher/package.nix
+++ b/pkgs/by-name/fl/flex-launcher/package.nix
@@ -4,6 +4,7 @@
   SDL2,
   SDL2_ttf,
   SDL2_image,
+  libX11,
   cmake,
   validatePkgConfig,
   inih,
@@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_ttf
     SDL2_image
+    libX11
     inih
   ];
 
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 62d60e8abbcd..93b67977a236 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
       libsndfile
       rtmidi
       SDL2
+      libX11
       zlib
       portaudio
     ]
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index 69d139328916..aa000df15212 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -15,6 +15,7 @@
   libpng,
   libvlc,
   libvorbis,
+  libX11,
   openal,
   python3,
   zlib,
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libvlc
     libvorbis
+    libX11
     openal
     python3
     zlib
diff --git a/pkgs/by-name/go/gource/package.nix b/pkgs/by-name/go/gource/package.nix
index 41ee7d59812f..3d14cafc0414 100644
--- a/pkgs/by-name/go/gource/package.nix
+++ b/pkgs/by-name/go/gource/package.nix
@@ -13,6 +13,7 @@
   glew,
   libGLU,
   libGL,
+  libX11,
   boost,
   glm,
   tinyxml,
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     libGLU
     libGL
+    libX11
     boost
     glm
     freetype
diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix
index 3b4ea626225e..b35cb5fbb61a 100644
--- a/pkgs/by-name/lo/logstalgia/package.nix
+++ b/pkgs/by-name/lo/logstalgia/package.nix
@@ -12,6 +12,7 @@
   glew,
   libGLU,
   libGL,
+  libX11,
   boost,
   glm,
   freetype,
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
     ftgl
     libpng
     libjpeg
+    libX11
     pcre
     SDL2_image
     libGLU
diff --git a/pkgs/by-name/ma/manaplus/package.nix b/pkgs/by-name/ma/manaplus/package.nix
index f6390f2f0f92..cb30d88c53cd 100644
--- a/pkgs/by-name/ma/manaplus/package.nix
+++ b/pkgs/by-name/ma/manaplus/package.nix
@@ -13,6 +13,7 @@
   curl,
   libxml2,
   libpng,
+  libX11,
   pkg-config,
   libGL,
   autoreconfHook,
@@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libGL
     libpng
+    libX11
     libxml2
     physfs
     zlib
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 642af48e9099..81b2a6b0843e 100644
--- a/pkgs/by-name/me/megaglest/package.nix
+++ b/pkgs/by-name/me/megaglest/package.nix
@@ -117,6 +117,7 @@ stdenv.mkDerivation {
   buildInputs = [
     curl
     SDL2
+    xorg.libX11
     xercesc
     openal
     lua
diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix
index beff76cf9dd5..9a7c87f889a2 100644
--- a/pkgs/by-name/op/openjk/package.nix
+++ b/pkgs/by-name/op/openjk/package.nix
@@ -9,6 +9,7 @@
   zlib,
   libpng,
   libGL,
+  libX11,
   SDL2,
   unstableGitUpdater,
 }:
@@ -64,6 +65,7 @@ stdenv.mkDerivation {
     zlib
     libpng
     libGL
+    libX11
     SDL2
   ];
 
diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix
index 7167d5b86642..bf2722098390 100644
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@@ -14,6 +14,7 @@
   libpng,
   libtheora,
   libvorbis,
+  libX11,
   python3,
   tcl,
   zlib,
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     SDL2_ttf
+    libX11
     alsa-lib
     freetype
     glew
diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix
index c169f5c76e03..8a17cc5f6e20 100644
--- a/pkgs/by-name/op/openrw/package.nix
+++ b/pkgs/by-name/op/openrw/package.nix
@@ -16,6 +16,7 @@
   libGL,
   libGLU,
   libmad,
+  libX11,
   openal,
 
   unstableGitUpdater,
@@ -52,6 +53,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libmad
+    libX11
     openal
   ];
 
diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index c909425f7814..70c95e38e69e 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -9,6 +9,7 @@
   libffi,
   libsForQt5,
   libzip,
+  libX11,
   makeDesktopItem,
   makeWrapper,
   pkg-config,
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [
       SDL2
+      libX11
       glew
       libzip
       zlib
diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix
index 74b0e08d35f5..7dd413cb058a 100644
--- a/pkgs/by-name/ri/rigel-engine/package.nix
+++ b/pkgs/by-name/ri/rigel-engine/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  libX11,
   SDL2,
   SDL2_mixer,
   buildOpenGLES ? false,
@@ -25,6 +26,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
+    libX11
     SDL2
     SDL2_mixer
   ];
diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 933114e62d7d..8616fd77907b 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -6,6 +6,7 @@
   cmake,
   ncurses,
   SDL2,
+  libX11,
 }:
 
 stdenv.mkDerivation {
@@ -31,6 +32,7 @@ stdenv.mkDerivation {
   buildInputs = [
     ncurses
     SDL2
+    libX11
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix
index ba90ba450dd0..88e0c39351b1 100644
--- a/pkgs/by-name/tr/trigger-control/package.nix
+++ b/pkgs/by-name/tr/trigger-control/package.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   pkg-config,
   SDL2,
+  libX11,
   dbus,
   libdecor,
   libnotify,
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [
       SDL2
+      libX11
       dbus
       libnotify
     ]
diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
index 69baa283fa04..3284797b3027 100644
--- a/pkgs/by-name/wa/wargus/stratagus.nix
+++ b/pkgs/by-name/wa/wargus/stratagus.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  makeWrapper,
   zlib,
   bzip2,
   libpng,
+  libX11,
   lua5_1,
   toluapp,
   SDL2,
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     SDL2_mixer
     libGL
+    libX11
   ];
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow"
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 75355eb4c4c9..5053e998158c 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -14,6 +14,7 @@
   libsamplerate,
   libvorbis,
   libxml2,
+  libX11,
   makeWrapper,
   movit,
   opencv4,
@@ -109,9 +110,11 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals enableSDL1 [
       SDL
+      libX11
     ]
     ++ lib.optionals enableSDL2 [
       SDL2
+      libX11
     ];
 
   outputs = [
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 4f26dbed108a..a672be370e69 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -10,6 +10,7 @@
   libogg,
   libtool,
   libvorbis,
+  libX11,
   pkg-config,
   zlib,
   enableTools ? false,
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
       SDL2
       libogg
       libvorbis
+      libX11
       zlib
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index ea8b0bf1cf0c..fe583be48a4a 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -16,6 +16,7 @@
   libvorbis,
   libGLU,
   libGL,
+  libX11,
   SDL2,
   zlib,
   Cocoa,
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
       libtheora
       libvorbis
       SDL2
+      libX11
       zlib
     ];
 
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index c847ad4ceda4..6f0590dd0e1a 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -8,6 +8,7 @@
   mygui,
   ois,
   SDL2,
+  libX11,
   libvorbis,
   pkg-config,
   makeWrapper,
@@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
     stuntrally_mygui
     ois
     SDL2
+    libX11
     libvorbis
     enet
     libXcursor
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 31aaf3a5f46b..d7a1294b3d51 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -16,6 +16,7 @@
   freetype,
   libjpeg,
   libpng,
+  libX11,
   harfbuzz,
   mcpp,
   wiiuse,
@@ -106,6 +107,7 @@ stdenv.mkDerivation rec {
       curl
       libjpeg
       libpng
+      libX11
       harfbuzz
       mcpp
       wiiuse