diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7030ee6e6e1f..2bc124d6066a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -962,6 +962,12 @@ with lib.maintainers; { shortName = "SageMath"; }; + sdl = { + members = [ ]; + scope = "Maintain SDL libraries."; + shortName = "SDL"; + }; + sphinx = { members = [ ]; scope = "Maintain Sphinx related packages."; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix deleted file mode 100644 index 07dbfef2f5f5..000000000000 --- a/pkgs/applications/misc/vp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: - -stdenv.mkDerivation rec { - pname = "vp"; - version = "1.8"; - - src = fetchFromGitHub { - owner = "erikg"; - repo = "vp"; - rev = "v${version}"; - sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ SDL SDL_image ]; - - env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; - - meta = with lib; { - homepage = "https://brlcad.org/~erik/"; - description = "SDL based picture viewer/slideshow"; - platforms = platforms.unix; - license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; - mainProgram = "vp"; - }; -} diff --git a/pkgs/games/btanks/default.nix b/pkgs/by-name/bt/btanks/package.nix similarity index 62% rename from pkgs/games/btanks/default.nix rename to pkgs/by-name/bt/btanks/package.nix index f1f2e84a614d..c055e64e664d 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/by-name/bt/btanks/package.nix @@ -1,23 +1,30 @@ -{ lib, stdenv, fetchurl, fetchpatch, scons, pkg-config, SDL, libGL, zlib, smpeg -, SDL_image, libvorbis, expat, zip, lua }: +{ + lib, + SDL, + SDL_image, + expat, + fetchpatch, + fetchurl, + libGL, + libvorbis, + lua, + pkg-config, + scons, + smpeg, + stdenv, + zip, + zlib, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btanks"; version = "0.9.8083"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/btanks/btanks-${finalAttrs.version}.tar.bz2"; hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E="; }; - nativeBuildInputs = [ scons pkg-config ]; - - buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; - patches = [ (fetchpatch { name = "lua52.patch"; @@ -42,10 +49,37 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { - description = "Fast 2d tank arcade game"; + nativeBuildInputs = [ + SDL + pkg-config + scons + smpeg + zip + ]; + + buildInputs = [ + SDL + SDL_image + expat + libGL + libvorbis + lua + smpeg + zlib + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_image}/include/SDL"; + + enableParallelBuilding = true; + + strictDeps = true; + + meta = { homepage = "https://sourceforge.net/projects/btanks/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + description = "Fast 2d tank arcade game with multiplayer and split-screen modes"; + license = lib.licenses.gpl2Plus; + mainProgram = "btanks"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL.meta) platforms; }; -} +}) diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/by-name/gu/guile-sdl/package.nix similarity index 50% rename from pkgs/development/guile-modules/guile-sdl/default.nix rename to pkgs/by-name/gu/guile-sdl/package.nix index 75ca3d8e4aa4..83879b26f7db 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/by-name/gu/guile-sdl/package.nix @@ -1,60 +1,60 @@ -{ lib -, stdenv -, fetchurl -, guile -, lzip -, pkg-config -, SDL -, SDL_image -, SDL_mixer -, SDL_ttf -, buildEnv +{ + lib, + SDL, + SDL_image, + SDL_mixer, + SDL_ttf, + buildEnv, + fetchurl, + guile, + lzip, + pkg-config, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-sdl"; version = "0.6.1"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.lz"; + url = "mirror://gnu/guile-sdl/guile-sdl-${finalAttrs.version}.tar.lz"; hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE="; }; - strictDeps = true; - nativeBuildInputs = [ + SDL guile lzip pkg-config - SDL ]; buildInputs = [ - guile (lib.getDev SDL) - SDL_image - SDL_mixer - SDL_ttf + (lib.getDev SDL_image) + (lib.getDev SDL_mixer) + (lib.getDev SDL_ttf) + guile ]; makeFlags = let sdl-env = buildEnv { name = "sdl-env"; - paths = buildInputs; + paths = finalAttrs.buildInputs; }; in [ "SDLMINUSI=-I${sdl-env}/include/SDL" ]; - meta = with lib; { + strictDeps = true; + + meta = { homepage = "https://www.gnu.org/software/guile-sdl/"; description = "Guile bindings for SDL"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = guile.meta.platforms; - # configure: error: *** SDL version not found! - broken = stdenv.isDarwin; + license = lib.licenses.gpl3Plus; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (guile.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix new file mode 100644 index 000000000000..74b440b42773 --- /dev/null +++ b/pkgs/by-name/on/onscripter-en/package.nix @@ -0,0 +1,67 @@ +{ + lib, + SDL, + SDL_image, + SDL_mixer, + SDL_ttf, + fetchFromGitHub, + freetype, + libjpeg, + libogg, + libpng, + libvorbis, + pkg-config, + smpeg, + stdenv, +}: + + +stdenv.mkDerivation (finalAttrs: { + pname = "onscripter-en"; + version = "20110930"; + + # The website is not available now. Let's use a Museoa backup + src = fetchFromGitHub { + owner = "museoa"; + repo = "onscripter-en"; + rev = finalAttrs.version; + hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg="; + }; + + nativeBuildInputs = [ + SDL + pkg-config + smpeg + ]; + + buildInputs = [ + SDL + SDL_image + SDL_mixer + SDL_ttf + freetype + libjpeg + libogg + libpng + libvorbis + smpeg + ]; + + configureFlags = [ "--no-werror" ]; + + strictDeps = true; + + preBuild = '' + sed -i 's/.dll//g' Makefile + ''; + + meta = { + homepage = "http://github.com/museoa/onscripter-en"; + description = "Japanese visual novel scripting engine"; + license = lib.licenses.gpl2Plus; + mainProgram = "onscripter-en"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix index e81d392ca6d6..de418804851e 100644 --- a/pkgs/by-name/sd/SDL2_Pango/package.nix +++ b/pkgs/by-name/sd/SDL2_Pango/package.nix @@ -1,48 +1,50 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, freetype -, pango -, SDL2 -, darwin +{ + lib, + SDL2, + autoreconfHook, + darwin, + fetchFromGitHub, + freetype, + pango, + pkg-config, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdl2-pango"; version = "2.1.5"; src = fetchFromGitHub { owner = "markuskimius"; repo = "SDL2_Pango"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8SL5ylxi87TuKreC8m2kxlLr8rcmwYYvwkp4vQZ9dkc="; }; + nativeBuildInputs = [ + SDL2 + autoreconfHook + pkg-config + ]; + + buildInputs = [ + SDL2 + freetype + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + outputs = [ "out" "dev" ]; strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - SDL2 - ]; - - buildInputs = [ - freetype - pango - SDL2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - ]; - - meta = with lib; { - description = "A library for graphically rendering internationalized and tagged text in SDL2 using TrueType fonts"; + meta = { homepage = "https://github.com/markuskimius/SDL2_Pango"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ rardiol ]; - platforms = platforms.all; + description = "A library for graphically rendering internationalized and tagged text in SDL2 using TrueType fonts"; + license = lib.licenses.lgpl21Plus; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ rardiol ]); + inherit (SDL2.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix new file mode 100644 index 000000000000..d74d859fefcb --- /dev/null +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -0,0 +1,75 @@ +{ lib, + SDL2, + darwin, + fetchurl, + pkg-config, + stdenv, + testers, + # Boolean flags + enableMmx ? stdenv.hostPlatform.isx86, + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL2_gfx"; + version = "1.0.4"; + + src = fetchurl { + url = "http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${finalAttrs.version}.tar.gz"; + hash = "sha256-Y+DgGt3tyd8vhbk6JI8G6KBK/6AUqDXC6jS/405XYmI="; + }; + + nativeBuildInputs = [ + SDL2 + pkg-config + ]; + + buildInputs = [ + SDL2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + (lib.enableFeature enableMmx "mmx") + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + homepage = "http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"; + description = "SDL graphics drawing primitives and support functions"; + longDescription = '' + The SDL_gfx library evolved out of the SDL_gfxPrimitives code which + provided basic drawing routines such as lines, circles or polygons and + SDL_rotozoom which implemented a interpolating rotozoomer for SDL + surfaces. + + The current components of the SDL_gfx library are: + + - Graphic Primitives (SDL_gfxPrimitves.h) + - Rotozoomer (SDL_rotozoom.h) + - Framerate control (SDL_framerate.h) + - MMX image filters (SDL_imageFilter.h) + - Custom Blit functions (SDL_gfxBlitFunc.h) + + The library is backwards compatible to the above mentioned code. Its is + written in plain C and can be used in C++ code. + ''; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + pkgConfigModules = [ "SDL2_gfx" ]; + inherit (SDL2.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index c271614d8f5f..976dc2f5fa92 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -14,6 +14,9 @@ smpeg2, stdenv, timidity, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), + enableSmpegtest ? (!stdenv.isDarwin), }: let @@ -66,8 +69,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "music-mp3-mpg123-shared") (lib.enableFeature false "music-opus-shared") (lib.enableFeature false "music-midi-fluidsynth-shared") - (lib.enableFeature (!stdenv.isDarwin) "sdltest") - (lib.enableFeature (!stdenv.isDarwin) "smpegtest") + (lib.enableFeature enableSdltest "sdltest") + (lib.enableFeature enableSmpegtest "smpegtest") # override default path to allow MIDI files to be played (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") ]; @@ -76,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_mixer"; description = "SDL multi-channel audio mixer library"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ AndersonTorres ]); platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sd/SDL2_net/package.nix b/pkgs/by-name/sd/SDL2_net/package.nix index 79e0e0098623..0214e2cd5b4b 100644 --- a/pkgs/by-name/sd/SDL2_net/package.nix +++ b/pkgs/by-name/sd/SDL2_net/package.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_net"; description = "SDL multiplatform networking library"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/development/libraries/SDL2_sound/default.nix b/pkgs/by-name/sd/SDL2_sound/package.nix similarity index 92% rename from pkgs/development/libraries/SDL2_sound/default.nix rename to pkgs/by-name/sd/SDL2_sound/package.nix index 056991c9aca4..14f57cb49eab 100644 --- a/pkgs/development/libraries/SDL2_sound/default.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -8,10 +8,15 @@ , libmikmod , libvorbis , timidity -, AudioToolbox -, CoreAudio +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) + AudioToolbox + CoreAudio + ; +in stdenv.mkDerivation rec { pname = "SDL2_sound"; version = "2.0.1"; diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix new file mode 100644 index 000000000000..b4cda2440237 --- /dev/null +++ b/pkgs/by-name/sd/SDL2_ttf/package.nix @@ -0,0 +1,65 @@ +{ + lib, + SDL2, + darwin, + fetchurl, + freetype, + harfbuzz, + libGL, + pkg-config, + stdenv, + testers, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL2_ttf"; + version = "2.22.0"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; + }; + + nativeBuildInputs = [ + SDL2 + pkg-config + ]; + + buildInputs = [ + SDL2 + freetype + harfbuzz + ] + ++ lib.optionals (!stdenv.isDarwin) [ + libGL + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + + configureFlags = [ + (lib.enableFeature false "harfbuzz-builtin") + (lib.enableFeature false "freetype-builtin") + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + homepage = "https://github.com/libsdl-org/SDL_ttf"; + description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL2.meta) platforms; + pkgConfigModules = [ "SDL2_ttf" ]; + }; +}) diff --git a/pkgs/development/libraries/SDL_Pango/fixes.patch b/pkgs/by-name/sd/SDL_Pango/0001-fixes.patch similarity index 100% rename from pkgs/development/libraries/SDL_Pango/fixes.patch rename to pkgs/by-name/sd/SDL_Pango/0001-fixes.patch diff --git a/pkgs/by-name/sd/SDL_Pango/package.nix b/pkgs/by-name/sd/SDL_Pango/package.nix new file mode 100644 index 000000000000..8c4160d98684 --- /dev/null +++ b/pkgs/by-name/sd/SDL_Pango/package.nix @@ -0,0 +1,57 @@ +{ + lib, + SDL, + autoreconfHook, + fetchpatch, + fetchurl, + pango, + pkg-config, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_Pango"; + version = "0.1.2"; + + src = fetchurl { + url = "mirror://sourceforge/sdlpango/SDL_Pango-${finalAttrs.version}.tar.gz"; + hash = "sha256-f3XTuXrPcHxpbqEmQkkGIE6/oHZgFi3pJRc83QJX66Q="; + }; + + patches = [ + (fetchpatch { + name = "0000-api_additions.patch"; + url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; + hash = "sha256-jfr+R4tIVZfYoaY4i+aNSGLwJGEipnuKqD2O9orP5QI="; + }) + ./0001-fixes.patch + ]; + + nativeBuildInputs = [ + SDL + autoreconfHook + pkg-config + ]; + + buildInputs = [ + SDL + pango + ]; + + configureFlags = [ + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://sdlpango.sourceforge.net/"; + description = "Connects the Pango rendering engine to SDL"; + license = lib.licenses.lgpl21Plus; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ puckipedia ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix new file mode 100644 index 000000000000..af84b5c0d0dc --- /dev/null +++ b/pkgs/by-name/sd/SDL_audiolib/package.nix @@ -0,0 +1,59 @@ +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_audiolib"; + version = "0-unstable-2022-04-17"; + + src = fetchFromGitHub { + owner = "realnc"; + repo = "SDL_audiolib"; + rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; + hash = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; + }; + + nativeBuildInputs = [ + SDL2 + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + ]; + + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "USE_DEC_ADLMIDI" false) + (lib.cmakeBool "USE_DEC_BASSMIDI" false) + (lib.cmakeBool "USE_DEC_DRFLAC" false) + (lib.cmakeBool "USE_DEC_FLUIDSYNTH" false) + (lib.cmakeBool "USE_DEC_LIBOPUSFILE" false) + (lib.cmakeBool "USE_DEC_LIBVORBIS" false) + (lib.cmakeBool "USE_DEC_MODPLUG" false) + (lib.cmakeBool "USE_DEC_MPG123" false) + (lib.cmakeBool "USE_DEC_MUSEPACK" false) + (lib.cmakeBool "USE_DEC_OPENMPT" false) + (lib.cmakeBool "USE_DEC_SNDFILE" false) + (lib.cmakeBool "USE_DEC_WILDMIDI" false) + (lib.cmakeBool "USE_DEC_XMP" false) + (lib.cmakeBool "USE_RESAMP_SOXR" false) + (lib.cmakeBool "USE_RESAMP_SRC" false) + ]; + + meta = { + description = "Audio decoding, resampling and mixing library for SDL"; + homepage = "https://github.com/realnc/SDL_audiolib"; + license = lib.licenses.lgpl3Plus; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL2.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix new file mode 100644 index 000000000000..558e1943a14b --- /dev/null +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -0,0 +1,58 @@ +{ + lib, + SDL, + fetchurl, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_gfx"; + version = "2.0.27"; + + src = fetchurl { + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${finalAttrs.version}.tar.gz"; + hash = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; + }; + + nativeBuildInputs = [ SDL ]; + + buildInputs = [ SDL ]; + + # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h + propagatedBuildInputs = [ SDL ]; + + configureFlags = [ + (lib.enableFeature false "mmx") + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://sourceforge.net/projects/sdlgfx/"; + description = "SDL graphics drawing primitives and support functions"; + longDescription = '' + The SDL_gfx library evolved out of the SDL_gfxPrimitives code which + provided basic drawing routines such as lines, circles or polygons and + SDL_rotozoom which implemented a interpolating rotozoomer for SDL + surfaces. + + The current components of the SDL_gfx library are: + + - Graphic Primitives (SDL_gfxPrimitves.h) + - Rotozoomer (SDL_rotozoom.h) + - Framerate control (SDL_framerate.h) + - MMX image filters (SDL_imageFilter.h) + - Custom Blit functions (SDL_gfxBlitFunc.h) + + The library is backwards compatible to the above mentioned code. Its is + written in plain C and can be used in C++ code. + ''; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_gpu/package.nix b/pkgs/by-name/sd/SDL_gpu/package.nix new file mode 100644 index 000000000000..d2fb9d98d26e --- /dev/null +++ b/pkgs/by-name/sd/SDL_gpu/package.nix @@ -0,0 +1,52 @@ +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + libGLU, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_gpu"; + version = "0-unstable-2022-06-24"; + + src = fetchFromGitHub { + owner = "grimfang4"; + repo = "sdl-gpu"; + rev = "e8ee3522ba0dbe72ca387d978e5f49a9f31e7ba0"; + hash = "sha256-z1ZuHh9hvno2h+kCKfe+uWa/S6/OLZWWgLZ0zs9HetQ="; + }; + + nativeBuildInputs = [ + SDL2 + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + libGLU + ]; + + cmakeFlags = [ + (lib.cmakeBool "SDL_gpu_BUILD_DEMOS" false) + (lib.cmakeBool "SDL_gpu_BUILD_TOOLS" false) + (lib.cmakeBool "SDL_gpu_BUILD_VIDEO_TEST" false) + (lib.cmakeBool "SDL_gpu_BUILD_TESTS" false) + ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + meta = { + description = "A library for high-performance, modern 2D graphics with SDL written in C"; + homepage = "https://grimfang4.github.io/sdl-gpu"; + license = lib.licenses.mit; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL2.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix new file mode 100644 index 000000000000..c49e195f970f --- /dev/null +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -0,0 +1,69 @@ +{ + lib, + SDL, + fetchpatch, + fetchurl, + giflib, + libXpm, + libjpeg, + libpng, + libtiff, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_image"; + version = "1.2.12"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_image/release/SDL_image-${finalAttrs.version}.tar.gz"; + hash = "sha256-C5ByKYRWEATehIR3RNVmgJ27na9zKp5QO5GhtahOVpk="; + }; + + patches = [ + # Fixed security vulnerability in XCF image loader + (fetchpatch { + name = "CVE-2017-2887"; + url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch"; + includes = [ "IMG_xcf.c" ]; + hash = "sha256-Z0nyEtE1LNGsGsN9SFG8ZyPDdunmvg81tUnEkrJQk5w="; + }) + ]; + + configureFlags = [ + # Disable dynamic loading or else dlopen will fail because of no proper + # rpath + (lib.enableFeature false "jpg-shared") + (lib.enableFeature false "png-shared") + (lib.enableFeature false "tif-shared") + (lib.enableFeature (!stdenv.isDarwin) "sdltest") + ]; + + nativeBuildInputs = [ + SDL + pkg-config + ]; + + buildInputs = [ + SDL + giflib + libXpm + libjpeg + libpng + libtiff + ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + meta = { + homepage = "http://www.libsdl.org/projects/SDL_image/"; + description = "SDL image library"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/by-name/sd/SDL_mixer/package.nix similarity index 63% rename from pkgs/development/libraries/SDL_mixer/default.nix rename to pkgs/by-name/sd/SDL_mixer/package.nix index 12b50cd476ba..470bd5559d7c 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -1,16 +1,28 @@ -{ stdenv, lib, fetchurl, fetchpatch -, SDL, libogg, libvorbis, smpeg, libmikmod -, fluidsynth, pkg-config -, enableNativeMidi ? false +{ + lib, + SDL, + fetchpatch, + fetchurl, + fluidsynth, + libmikmod, + libogg, + libvorbis, + pkg-config, + smpeg, + stdenv, + # Boolean flags + enableNativeMidi ? false, + enableSdltest ? (!stdenv.isDarwin), + enableSmpegtest ? (!stdenv.isDarwin), }: -stdenv.mkDerivation rec { - pname = "SDL_mixer"; +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_mixer"; version = "1.2.12"; src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz"; - sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; + url = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${finalAttrs.version}.tar.gz"; + hash = "sha256-FkQwgnmpdXmQSeSCavLPx4fK0quxGqFFYuQCUh+GmSo="; }; patches = [ @@ -31,7 +43,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "mikmod-fixes.patch"; url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; - hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk="; }) # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). (fetchpatch { @@ -51,18 +63,39 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; + nativeBuildInputs = [ + SDL + pkg-config + smpeg + ]; - configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ] - ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; + buildInputs = [ + SDL + fluidsynth + libmikmod + libogg + libvorbis + smpeg + ]; - meta = with lib; { + configureFlags = [ + (lib.enableFeature false "music-ogg-shared") + (lib.enableFeature false "music-mod-shared") + (lib.enableFeature enableNativeMidi "music-native-midi-gpl") + (lib.enableFeature enableSdltest "sdltest") + (lib.enableFeature enableSmpegtest "smpegtest") + ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + meta = { description = "SDL multi-channel audio mixer library"; - homepage = "http://www.libsdl.org/projects/SDL_mixer/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.zlib; + homepage = "http://www.libsdl.org/projects/SDL_mixer/"; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + license = lib.licenses.zlib; + inherit (SDL.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/sd/SDL_net/package.nix b/pkgs/by-name/sd/SDL_net/package.nix new file mode 100644 index 000000000000..4d45ff624e8f --- /dev/null +++ b/pkgs/by-name/sd/SDL_net/package.nix @@ -0,0 +1,43 @@ +{ + lib, + SDL, + fetchurl, + pkg-config, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin) +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_net"; + version = "1.2.8"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${finalAttrs.version}.tar.gz"; + hash = "sha256-X0p6i7iE95PCeKw/NxO+QZgMXu3M7P8CYEETR3FPrLQ="; + }; + + nativeBuildInputs = [ + SDL + pkg-config + ]; + + propagatedBuildInputs = [ + SDL + ]; + + configureFlags = [ + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/libsdl-org/SDL_net"; + description = "SDL networking library"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_sixel/package.nix b/pkgs/by-name/sd/SDL_sixel/package.nix new file mode 100644 index 000000000000..7acd03b19f6c --- /dev/null +++ b/pkgs/by-name/sd/SDL_sixel/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + libsixel, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation { + pname = "SDL_sixel"; + version = "0-unstable-2016-02-06"; + + src = fetchFromGitHub { + owner = "saitoha"; + repo = "SDL1.2-SIXEL"; + rev = "ab3fccac6e34260a617be511bd8c2b2beae41952"; + hash = "sha256-l5eLnfV2ozAlfiTo2pr0a2BXv/pwfpX4pycw1Z7doj4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libsixel ]; + + configureFlags = [ + (lib.enableFeature true "video-sixel") + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; + description = "A SDL 1.2 patched with libsixel support"; + license = lib.licenses.lgpl21; + mainProgram = "sdl-config"; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ vrthra ]); + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix new file mode 100644 index 000000000000..b5e93b3efdf2 --- /dev/null +++ b/pkgs/by-name/sd/SDL_sound/package.nix @@ -0,0 +1,48 @@ +{ + lib, + SDL, + fetchurl, + flac, + libmikmod, + libvorbis, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin) +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_sound"; + version = "1.0.3"; + + src = fetchurl { + url = "https://icculus.org/SDL_sound/downloads/SDL_sound-${finalAttrs.version}.tar.gz"; + hash = "sha256-OZn9C7tIUomlK+FLL2i1ccuE44DMQzh+rfd49kx55t8="; + }; + + nativeBuildInputs = [ + SDL + ]; + + buildInputs = [ + SDL + flac + libmikmod + libvorbis + ]; + + configureFlags = [ + (lib.enableFeature enableSdltest "--disable-sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://www.icculus.org/SDL_sound/"; + description = "SDL sound library"; + license = lib.licenses.lgpl21Plus; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + mainProgram = "playsound"; + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_stretch/package.nix b/pkgs/by-name/sd/SDL_stretch/package.nix new file mode 100644 index 000000000000..f7267b86fd6d --- /dev/null +++ b/pkgs/by-name/sd/SDL_stretch/package.nix @@ -0,0 +1,31 @@ +{ + lib, + SDL, + fetchurl, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_stretch"; + version = "0.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/sdl-stretch/${finalAttrs.version}/SDL_stretch-${finalAttrs.version}.tar.bz2"; + hash = "sha256-fL8L+rAMPt1uceGH0qLEgncEh4DiySQIuqt7YjUy/Nc="; + }; + + nativeBuildInputs = [ SDL ]; + + buildInputs = [ SDL ]; + + strictDeps = true; + + meta = { + homepage = "https://sdl-stretch.sourceforge.net/"; + description = "Stretch Functions For SDL"; + license = lib.licenses.lgpl2; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix new file mode 100644 index 000000000000..a44aeaa7f05b --- /dev/null +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -0,0 +1,55 @@ +{ + lib, + SDL, + fetchpatch, + fetchurl, + freetype, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_ttf"; + version = "2.0.11"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${finalAttrs.version}.tar.gz"; + hash = "sha256-ckzYlez02jGaPvFkiStyB4vZJjKl2BIREmHN4kjrzbc="; + }; + + patches = [ + # Bug #830: TTF_RenderGlyph_Shaded is broken + (fetchpatch { + url = "https://bugzilla-attachments.libsdl.org/attachments/830/renderglyph_shaded.patch.txt"; + hash = "sha256-TZzlZe7gCRA8wZDHQZsqESAOGbLpJzIoB0HD8L6z3zE="; + }) + ]; + + patchFlags = [ "-p0" ]; + + buildInputs = [ + SDL + freetype + ]; + + nativeBuildInputs = [ + SDL + freetype + ]; + + configureFlags = [ + (lib.enableFeature enableSdltest "-sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/libsdl-org/SDL_ttf"; + description = "SDL TrueType library"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ ]); + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix new file mode 100644 index 000000000000..0676ef14f2aa --- /dev/null +++ b/pkgs/by-name/vp/vp/package.nix @@ -0,0 +1,48 @@ +{ + lib, + SDL, + SDL_image, + autoreconfHook, + fetchFromGitHub, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vp"; + version = "1.8-unstable-2017-03-22"; + + src = fetchFromGitHub { + owner = "erikg"; + repo = "vp"; + rev = "52bae15955dbd7270cc906af59bb0fe821a01f27"; + hash = "sha256-AWRJ//0z97EwvQ00qWDjVeZrPrKnRMOXn4RagdVrcFc="; + }; + + nativeBuildInputs = [ + autoreconfHook + SDL + ]; + + buildInputs = [ + SDL + SDL_image + ]; + + outputs = [ "out" "man" ]; + + strictDeps = true; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev SDL}/include/SDL" + "-I${lib.getDev SDL_image}/include/SDL" + ]; + + meta = { + homepage = "https://github.com/erikg/vp"; + description = "SDL based picture viewer/slideshow"; + license = lib.licenses.gpl3Plus; + mainProgram = "vp"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix deleted file mode 100644 index 83b57b42c7cd..000000000000 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2_gfx"; - version = "1.0.4"; - - src = fetchurl { - url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "SDL graphics drawing primitives and support functions"; - - longDescription = '' - The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. - - The current components of the SDL_gfx library are: - - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) - - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; - - homepage = "http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"; - license = licenses.zlib; - maintainers = with maintainers; [ cpages ]; - platforms = platforms.unix; - pkgConfigModules = [ "SDL2_gfx" ]; - }; -}) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix deleted file mode 100644 index 3407478b39b1..000000000000 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2_ttf"; - version = "2.22.0"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; - }; - - configureFlags = [ "--disable-harfbuzz-builtin" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 freetype harfbuzz ] - ++ lib.optional (!stdenv.isDarwin) libGL - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://github.com/libsdl-org/SDL_ttf"; - pkgConfigModules = [ "SDL2_ttf" ]; - }; -}) diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix deleted file mode 100644 index e24af838c65e..000000000000 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_Pango"; - version = "0.1.2"; - - src = fetchurl { - url = "mirror://sourceforge/sdlpango/${pname}-${version}.tar.gz"; - sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"; - }; - - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; - sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; - }) - ./fixes.patch - ]; - - preConfigure = "autoreconf -i -f"; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ SDL pango ]; - - meta = with lib; { - description = "Connects the Pango rendering engine to SDL"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - homepage = "https://sdlpango.sourceforge.net/"; - maintainers = with maintainers; [ puckipedia ]; - }; -} diff --git a/pkgs/development/libraries/SDL_audiolib/default.nix b/pkgs/development/libraries/SDL_audiolib/default.nix deleted file mode 100644 index 9b8a163b206c..000000000000 --- a/pkgs/development/libraries/SDL_audiolib/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, SDL2 -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "SDL_audiolib"; - version = "unstable-2022-04-17"; - - src = fetchFromGitHub { - owner = "realnc"; - repo = "SDL_audiolib"; - rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; - sha256 = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - ]; - - cmakeFlags = [ - "-DUSE_RESAMP_SRC=OFF" - "-DUSE_RESAMP_SOXR=OFF" - "-DUSE_DEC_DRFLAC=OFF" - "-DUSE_DEC_OPENMPT=OFF" - "-DUSE_DEC_XMP=OFF" - "-DUSE_DEC_MODPLUG=OFF" - "-DUSE_DEC_MPG123=OFF" - "-DUSE_DEC_SNDFILE=OFF" - "-DUSE_DEC_LIBVORBIS=OFF" - "-DUSE_DEC_LIBOPUSFILE=OFF" - "-DUSE_DEC_MUSEPACK=OFF" - "-DUSE_DEC_FLUIDSYNTH=OFF" - "-DUSE_DEC_BASSMIDI=OFF" - "-DUSE_DEC_WILDMIDI=OFF" - "-DUSE_DEC_ADLMIDI=OFF" - ]; - - meta = with lib; { - description = "Audio decoding, resampling and mixing library for SDL"; - homepage = "https://github.com/realnc/SDL_audiolib"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix deleted file mode 100644 index bccc11f43d41..000000000000 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, SDL }: - -stdenv.mkDerivation rec { - pname = "SDL_gfx"; - version = "2.0.27"; - - src = fetchurl { - url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; - sha256 = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; - }; - - # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h - propagatedBuildInputs = [ SDL ]; - buildInputs = [ SDL ] ; - - configureFlags = [ "--disable-mmx" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL graphics drawing primitives and support functions"; - - longDescription = '' - The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. - - The current components of the SDL_gfx library are: - - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) - - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; - - homepage = "https://sourceforge.net/projects/sdlgfx/"; - license = licenses.zlib; - - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix deleted file mode 100644 index dc52e6afeea7..000000000000 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: - -stdenv.mkDerivation { - pname = "SDL_gpu-unstable"; - version = "2019-01-24"; - - src = fetchFromGitHub { - owner = "grimfang4"; - repo = "sdl-gpu"; - rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef"; - sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 libGLU ]; - - cmakeFlags = [ - "-DSDL_gpu_BUILD_DEMOS=OFF" - "-DSDL_gpu_BUILD_TOOLS=OFF" - "-DSDL_gpu_BUILD_VIDEO_TEST=OFF" - "-DSDL_gpu_BUILD_TESTS=OFF" - ]; - - patchPhase = '' - sed -ie '210s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt - sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt - ''; - - meta = with lib; { - description = "A library for high-performance, modern 2D graphics with SDL written in C"; - homepage = "https://github.com/grimfang4/sdl-gpu"; - license = licenses.mit; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix deleted file mode 100644 index 30f71bd3e520..000000000000 --- a/pkgs/development/libraries/SDL_image/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_image"; - version = "1.2.12"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2017-2887"; - url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch"; - includes = [ "IMG_xcf.c" ]; - sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7"; - }) - ]; - - configureFlags = [ - # Disable its dynamic loading or dlopen will fail because of no proper rpath - "--disable-jpg-shared" - "--disable-png-shared" - "--disable-tif-shared" - ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ]; - - meta = with lib; { - description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.zlib; - }; -} diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix deleted file mode 100644 index e902213c9710..000000000000 --- a/pkgs/development/libraries/SDL_net/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, SDL, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_net"; - version = "1.2.8"; - - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; - sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; - }; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ SDL ]; - - meta = with lib; { - description = "SDL networking library"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; - }; -} diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix deleted file mode 100644 index 189fdee05b26..000000000000 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }: - -stdenv.mkDerivation { - pname = "SDL_sixel"; - version = "1.2-nightly"; - - src = fetchFromGitHub { - owner = "saitoha"; - repo = "SDL1.2-SIXEL"; - rev = "ab3fccac6e34260a617be511bd8c2b2beae41952"; - sha256 = "0gm2vngdac17lzw9azkhzazmfq3byjddms14gqjk18vnynfqp5wp"; - }; - - configureFlags = [ "--enable-video-sixel" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsixel ]; - - meta = with lib; { - description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; - mainProgram = "sdl-config"; - homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix deleted file mode 100644 index bdc97e98f341..000000000000 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: - -stdenv.mkDerivation rec { - pname = "SDL_sound"; - version = "1.0.3"; - - src = fetchurl { - url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz"; - sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; - }; - - buildInputs = [ SDL libvorbis flac libmikmod ]; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL sound library"; - platforms = platforms.unix; - license = licenses.lgpl21; - homepage = "https://www.icculus.org/SDL_sound/"; - }; -} diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix deleted file mode 100644 index 99f86dd258b3..000000000000 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, SDL }: - -stdenv.mkDerivation rec { - pname = "SDL_stretch"; - version = "0.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; - }; - - buildInputs = [ SDL ]; - - meta = with lib; { - description = "Stretch Functions For SDL"; - homepage = "https://sdl-stretch.sourceforge.net/"; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix deleted file mode 100644 index 5d353e3a6c0d..000000000000 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }: - -stdenv.mkDerivation rec { - pname = "SDL_ttf"; - version = "2.0.11"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; - }; - - patches = [ - # Bug #830: TTF_RenderGlyph_Shaded is broken - (fetchpatch { - url = "https://bugzilla-attachments.libsdl.org/attachment.cgi?id=830"; - sha256 = "0cfznfzg1hs10wl349z9n8chw80i5adl3iwhq4y102g0xrjyb72d"; - }) - ]; - - patchFlags = [ "-p0" ]; - - buildInputs = [ SDL freetype ]; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL TrueType library"; - license = licenses.zlib; - platforms = platforms.all; - homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix deleted file mode 100644 index edc9e20235ff..000000000000 --- a/pkgs/games/onscripter-en/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl -, libpng, libjpeg, libogg, libvorbis, freetype, smpeg -, SDL, SDL_image, SDL_mixer, SDL_ttf }: - - -stdenv.mkDerivation { - pname = "onscripter-en"; - version = "20111009"; - - src = fetchurl { - # The website is not available now. - url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20111009-src.tar.bz2"; - sha256 = "sha256-pir3ExhehJ9zNygDN83S4GOs5ugDNMjngxEwklAz9c8="; - }; - - buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg - SDL SDL_image SDL_mixer SDL_ttf - ]; - - configureFlags = [ "--no-werror" ]; - - # Without this libvorbisfile.so is not getting linked properly for some reason. - NIX_CFLAGS_LINK = "-lvorbisfile"; - - preBuild = '' - sed -i 's/.dll//g' Makefile - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Japanese visual novel scripting engine"; - mainProgram = "onscripter-en"; - homepage = "http://unclemion.com/onscripter/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a23cccbcd12..bfd89ef3adcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14134,10 +14134,9 @@ with pkgs; vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; - vp = callPackage ../applications/misc/vp { - # Enable next line for console graphics. Note that - # it requires `sixel` enabled terminals such as mlterm - # or xterm -ti 340 + vpWithSixel = vp.override { + # Enable next line for console graphics. Note that it requires `sixel` + # enabled terminals such as mlterm or xterm -ti 340 SDL = SDL_sixel; }; @@ -17748,7 +17747,7 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; @@ -24194,28 +24193,6 @@ with pkgs; SDL = SDL_classic; - SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { }; - - SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; - - SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; - - SDL_gpu = callPackage ../development/libraries/SDL_gpu { }; - - SDL_image = callPackage ../development/libraries/SDL_image { }; - - SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; - - SDL_net = callPackage ../development/libraries/SDL_net { }; - - SDL_Pango = callPackage ../development/libraries/SDL_Pango { }; - - SDL_sound = callPackage ../development/libraries/SDL_sound { }; - - SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; - - SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; - SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -24241,14 +24218,6 @@ with pkgs; }; }); - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; - - SDL2_sound = callPackage ../development/libraries/SDL2_sound { - inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; - }; - - SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; - sdrplay = callPackage ../applications/radio/sdrplay { }; sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; @@ -36486,8 +36455,6 @@ with pkgs; bsdgames = callPackage ../games/bsdgames { }; - btanks = callPackage ../games/btanks { }; - bugdom = callPackage ../games/bugdom { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; @@ -36995,8 +36962,6 @@ with pkgs; oilrush = callPackage ../games/oilrush { }; - onscripter-en = callPackage ../games/onscripter-en { }; - openarena = callPackage ../games/openarena { }; opendungeons = callPackage ../games/opendungeons { };