diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index dc57ce4678f59..48b68de0d3b22 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -6,7 +6,7 @@
   qt6,
   pkg-config,
   vulkan-headers,
-  SDL2,
+  SDL2_classic,
   SDL2_ttf,
   ffmpeg,
   libopus,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; })
+      (SDL2_classic.override { drmSupport = stdenv.hostPlatform.isLinux; })
       SDL2_ttf
       ffmpeg
       libopus
diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix
index e285137e459fc..ebda6555cd133 100644
--- a/pkgs/by-name/mo/movit/package.nix
+++ b/pkgs/by-name/mo/movit/package.nix
@@ -9,6 +9,8 @@
   darwin,
   eigen,
   libepoxy,
+  libGL,
+  libX11,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,6 +38,8 @@ stdenv.mkDerivation rec {
       SDL2
       fftw
       gtest
+      libGL
+      libX11
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.OpenGL
diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/by-name/sd/SDL2_classic/find-headers.patch
similarity index 100%
rename from pkgs/development/libraries/SDL2/find-headers.patch
rename to pkgs/by-name/sd/SDL2_classic/find-headers.patch
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/by-name/sd/SDL2_classic/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL2/default.nix
rename to pkgs/by-name/sd/SDL2_classic/package.nix
diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/by-name/sd/SDL2_classic/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/SDL2/setup-hook.sh
rename to pkgs/by-name/sd/SDL2_classic/setup-hook.sh
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index 0b28b9200e9e7..571619c61ff70 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -102,7 +102,11 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://libsdl.org";
     changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.zlib;
-    maintainers = with lib.maintainers; [ nadiaholmquist ];
+    maintainers = with lib.maintainers; [
+      nadiaholmquist
+      grimmauld
+      marcin-serwin
+    ];
     platforms = lib.platforms.all;
     pkgConfigModules = [ "sdl2_compat" ];
   };
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index b0791b66ccb5b..5e752571669ee 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -8,6 +8,7 @@
   jsoncpp,
   lib,
   libpng,
+  libX11,
   lua,
   luajit,
   meson,
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
     fftwFloat
     jsoncpp
     libpng
+    libX11
     lua
     luajit
     SDL2
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 5135dda20a5e5..6171b97e6d0d1 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  SDL2,
+  SDL2_classic,
   SDL2_image,
   rtaudio,
   rtmidi,
@@ -16,7 +16,7 @@
 }:
 let
   # package depends on SDL2main static library
-  SDL2' = SDL2.override {
+  SDL2' = SDL2_classic.override {
     withStatic = true;
   };
 in
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 87c6accaaad50..c53047136b495 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -8,7 +8,7 @@
   pkg-config,
   gettext,
   libsodium,
-  SDL2,
+  SDL2_classic,
   SDL2_image,
   SDL_audiolib,
   flac,
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     fmt
     libpng
     libsodium
-    SDL2
+    SDL2_classic
     SDL2_image
     SDL_audiolib'
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5812fa981adda..0a2ec43f46f2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10182,8 +10182,9 @@ with pkgs;
   };
 
   SDL = SDL_compat;
+  SDL2 = sdl2-compat;
 
-  SDL2 = callPackage ../development/libraries/SDL2 {
+  SDL2_classic = callPackage ../by-name/sd/SDL2_classic/package.nix {
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
   };
 
@@ -15773,7 +15774,7 @@ with pkgs;
 
   devilutionx = callPackage ../games/devilutionx {
     fmt = fmt_9;
-    SDL2 = SDL2.override {
+    SDL2_classic = SDL2_classic.override {
       withStatic = true;
     };
   };