diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix index 24428ad8a363..38cc6aac3f77 100644 --- a/pkgs/by-name/bl/blackvoxel/package.nix +++ b/pkgs/by-name/bl/blackvoxel/package.nix @@ -5,7 +5,7 @@ makeDesktopItem, imagemagick, glew_1_10, - SDL_compat, + sdl12-compat, nix-update-script, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glew_1_10 - SDL_compat + sdl12-compat ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/op/openxcom/package.nix b/pkgs/by-name/op/openxcom/package.nix index 275c1191ef8c..74b756d4fcad 100644 --- a/pkgs/by-name/op/openxcom/package.nix +++ b/pkgs/by-name/op/openxcom/package.nix @@ -7,7 +7,7 @@ libGL, openssl, pkg-config, - SDL_compat, + sdl12-compat, SDL_image, SDL_mixer, SDL_gfx, @@ -36,7 +36,7 @@ stdenv.mkDerivation { boost libGL libGLU - SDL_compat + sdl12-compat SDL_gfx SDL_image SDL_mixer diff --git a/pkgs/by-name/sd/SDL_compat/find-headers.patch b/pkgs/by-name/sd/sdl12-compat/find-headers.patch similarity index 100% rename from pkgs/by-name/sd/SDL_compat/find-headers.patch rename to pkgs/by-name/sd/sdl12-compat/find-headers.patch diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/sdl12-compat/package.nix similarity index 97% rename from pkgs/by-name/sd/SDL_compat/package.nix rename to pkgs/by-name/sd/sdl12-compat/package.nix index 5252282ea6b5..d6916bee7b86 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/sdl12-compat/package.nix @@ -26,7 +26,7 @@ let inherit (darwin) autoSignDarwinBinariesHook; in stdenv.mkDerivation (finalAttrs: { - pname = "SDL_compat"; + pname = "sdl12-compat"; version = "1.2.76"; src = fetchFromGitHub { @@ -36,6 +36,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hSHtYFn4gr8Y9cNyLBT6frDgidNCRENPtTrtGfgH3po="; }; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/sd/SDL_compat/setup-hook.sh b/pkgs/by-name/sd/sdl12-compat/setup-hook.sh similarity index 100% rename from pkgs/by-name/sd/SDL_compat/setup-hook.sh rename to pkgs/by-name/sd/sdl12-compat/setup-hook.sh diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 6a0d2b700357..5b6376cd9538 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -17,7 +17,7 @@ SDL2_sound, SDL2_mixer, SDL2_image, - SDL_compat, + sdl12-compat, ffmpeg, qemu, @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; inherit - SDL_compat + sdl12-compat SDL2_ttf SDL2_net SDL2_gfx diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 033f865c4708..19ee7429320d 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -40,7 +40,7 @@ wayland-scanner, zenity, # for passthru.tests - SDL_compat, + sdl12-compat, sdl2-compat, sdl3-image, sdl3-ttf, @@ -238,11 +238,11 @@ stdenv.mkDerivation (finalAttrs: { }); tests = - SDL_compat.tests + sdl12-compat.tests // sdl2-compat.tests // { inherit - SDL_compat + sdl12-compat sdl2-compat sdl3-image sdl3-ttf diff --git a/pkgs/by-name/st/stardust/package.nix b/pkgs/by-name/st/stardust/package.nix index 2066ae3f68e2..a84d4c63ab4f 100644 --- a/pkgs/by-name/st/stardust/package.nix +++ b/pkgs/by-name/st/stardust/package.nix @@ -5,7 +5,7 @@ zlib, libtiff, libxml2, - SDL_compat, + sdl12-compat, libx11, libxi, libxmu, @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; nativeBuildInputs = [ - SDL_compat + sdl12-compat libxml2 ]; buildInputs = [ zlib libtiff libxml2 - SDL_compat + sdl12-compat libx11 libxi libxmu diff --git a/pkgs/by-name/za/zandronum/package.nix b/pkgs/by-name/za/zandronum/package.nix index 7cf331bc8468..91d4f57ab137 100644 --- a/pkgs/by-name/za/zandronum/package.nix +++ b/pkgs/by-name/za/zandronum/package.nix @@ -7,7 +7,7 @@ makeWrapper, callPackage, soundfont-fluid, - SDL_compat, + sdl12-compat, libGL, libopus, glew, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { openssl bzip2 zlib - SDL_compat + sdl12-compat libjpeg sqlite game-music-emu diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c624bc8282e7..d6bb44d12231 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1920,6 +1920,7 @@ mapAliases { SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20 + SDL_compat = sdl12-compat; # Added 2026-05-19 seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21 seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21 semantik = throw "'semantik' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 967f82d68e34..e6ba36e1efe0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7098,7 +7098,7 @@ with pkgs; }; }; - SDL = SDL_compat; + SDL = sdl12-compat; SDL2 = sdl2-compat; sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;