SDL_compat: rename to it's real name, remove underscore, remove capitals (#522006)
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -7098,7 +7098,7 @@ with pkgs;
|
||||
};
|
||||
};
|
||||
|
||||
SDL = SDL_compat;
|
||||
SDL = sdl12-compat;
|
||||
SDL2 = sdl2-compat;
|
||||
|
||||
sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
|
||||
|
||||
Reference in New Issue
Block a user