From 25e4379880e050f173d39ba15e1f67a43ceb37f0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:13:37 -0300
Subject: [PATCH 01/49] team-list: create sdl team

A team dedicated to track SDL libraries.
---
 maintainers/team-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7030ee6e6e1fa51..2bc124d6066a9e9 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.";

From 7cd59482fa339f91017a78ca1bdc253c8c70e891 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 10:42:24 -0300
Subject: [PATCH 02/49] SDL2_mixer: refactor

- add lib.teams.sdl.members
---
 pkgs/by-name/sd/SDL2_mixer/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix
index c271614d8f5f89a..976dc2f5fa9240e 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;
   };
 })

From aa4a99c7d668f686c8ef9fa57b095bf96e9bd32d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 11:41:40 -0300
Subject: [PATCH 03/49] SDL2_net: refactor

- add lib.teams.sdl.members
- remove @AndersonTorres (since theey will be in the team)
---
 pkgs/by-name/sd/SDL2_net/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL2_net/package.nix b/pkgs/by-name/sd/SDL2_net/package.nix
index 79e0e0098623df9..0214e2cd5b4bbaf 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;
   };
 })

From c2b8d53a357bdc6fd8523259da89a128f54a674c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:29:35 -0300
Subject: [PATCH 04/49] SDL_Pango: migrate to by-name

---
 .../{development/libraries => by-name/sd}/SDL_Pango/fixes.patch | 0
 .../SDL_Pango/default.nix => by-name/sd/SDL_Pango/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/libraries => by-name/sd}/SDL_Pango/fixes.patch (100%)
 rename pkgs/{development/libraries/SDL_Pango/default.nix => by-name/sd/SDL_Pango/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_Pango/fixes.patch b/pkgs/by-name/sd/SDL_Pango/fixes.patch
similarity index 100%
rename from pkgs/development/libraries/SDL_Pango/fixes.patch
rename to pkgs/by-name/sd/SDL_Pango/fixes.patch
diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/by-name/sd/SDL_Pango/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_Pango/default.nix
rename to pkgs/by-name/sd/SDL_Pango/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9f0fb9cc21aff1..efa0a00fb51fd63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24196,8 +24196,6 @@ with pkgs;
 
   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 { };

From 0ae60219f1f2676f3e1a72511b49ce77ac6f2837 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 5 May 2024 18:36:10 -0300
Subject: [PATCH 05/49] SDL_Pango: refactor

- finalAttrs
- no nested with
- sdl team
---
 .../{fixes.patch => 0001-fixes.patch}         |  0
 pkgs/by-name/sd/SDL_Pango/package.nix         | 56 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)
 rename pkgs/by-name/sd/SDL_Pango/{fixes.patch => 0001-fixes.patch} (100%)

diff --git a/pkgs/by-name/sd/SDL_Pango/fixes.patch b/pkgs/by-name/sd/SDL_Pango/0001-fixes.patch
similarity index 100%
rename from pkgs/by-name/sd/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
index e24af838c65ed02..8c4160d98684a8a 100644
--- a/pkgs/by-name/sd/SDL_Pango/package.nix
+++ b/pkgs/by-name/sd/SDL_Pango/package.nix
@@ -1,33 +1,57 @@
-{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }:
+{
+  lib,
+  SDL,
+  autoreconfHook,
+  fetchpatch,
+  fetchurl,
+  pango,
+  pkg-config,
+  stdenv,
+  # Boolean flags
+  enableSdltest ? (!stdenv.isDarwin),
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_Pango";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sdlpango/${pname}-${version}.tar.gz";
-    sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz";
+    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";
-      sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld";
+      hash = "sha256-jfr+R4tIVZfYoaY4i+aNSGLwJGEipnuKqD2O9orP5QI=";
     })
-    ./fixes.patch
+    ./0001-fixes.patch
   ];
 
-  preConfigure = "autoreconf -i -f";
-  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+  nativeBuildInputs = [
+    SDL
+    autoreconfHook
+    pkg-config
+  ];
 
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ SDL pango ];
+  buildInputs = [
+    SDL
+    pango
+  ];
 
-  meta = with lib; {
-    description = "Connects the Pango rendering engine to SDL";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.all;
+  configureFlags = [
+    (lib.enableFeature enableSdltest "sdltest")
+  ];
+
+  strictDeps = true;
+
+  meta = {
     homepage = "https://sdlpango.sourceforge.net/";
-    maintainers = with maintainers; [ puckipedia ];
+    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;
   };
-}
+})

From a7eff4c8d8bc2db284246c17a53da40c31fc937a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:34:46 -0300
Subject: [PATCH 06/49] SDL_gfx: migrate to by-name

---
 .../SDL_gfx/default.nix => by-name/sd/SDL_gfx/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_gfx/default.nix => by-name/sd/SDL_gfx/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/by-name/sd/SDL_gfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_gfx/default.nix
rename to pkgs/by-name/sd/SDL_gfx/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efa0a00fb51fd63..39e31debebe46a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   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 { };

From db06c4f3df09648581343b8832ea4419d80080ca Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 13:04:15 -0300
Subject: [PATCH 07/49] SDL_gfx: refactor

- strictDeps
- add lib.teams.sdl.members
---
 pkgs/by-name/sd/SDL_gfx/package.nix | 68 +++++++++++++++++------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix
index bccc11f43d41805..558e1943a14b655 100644
--- a/pkgs/by-name/sd/SDL_gfx/package.nix
+++ b/pkgs/by-name/sd/SDL_gfx/package.nix
@@ -1,46 +1,58 @@
-{ lib, stdenv, fetchurl, SDL }:
-
-stdenv.mkDerivation rec {
+{
+  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/${pname}-${version}.tar.gz";
-    sha256 = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk=";
+    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 ];
-  buildInputs = [ SDL ] ;
 
-  configureFlags = [ "--disable-mmx" ]
-    ++ lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = [
+    (lib.enableFeature false "mmx")
+    (lib.enableFeature enableSdltest "sdltest")
+  ];
 
-  meta = with lib; {
-    description = "SDL graphics drawing primitives and support functions";
+  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 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)
+      - 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.
+      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;
+    license = lib.licenses.zlib;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ ]);
+    inherit (SDL.meta) platforms;
   };
-}
+})

From 98784a4081c8580c1682db14b9aeba15754df8bf Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:35:08 -0300
Subject: [PATCH 08/49] SDL_gpu: migrate to by-name

---
 .../SDL_gpu/default.nix => by-name/sd/SDL_gpu/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_gpu/default.nix => by-name/sd/SDL_gpu/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/by-name/sd/SDL_gpu/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_gpu/default.nix
rename to pkgs/by-name/sd/SDL_gpu/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39e31debebe46a4..3f8b1140e82387d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
 
-  SDL_gpu = callPackage ../development/libraries/SDL_gpu { };
-
   SDL_image = callPackage ../development/libraries/SDL_image { };
 
   SDL_mixer = callPackage ../development/libraries/SDL_mixer { };

From 232ab4014bf43a510da96c0567b3c75a5e652332 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 18:28:35 -0300
Subject: [PATCH 09/49] SDL_gpu: 2019-01-24 -> 0-unstable-2022-06-24

- finalAttrs design pattern
- remove @piddend (inactive, https://github.com/NixOS/nixpkgs/issues/290642)
---
 pkgs/by-name/sd/SDL_gpu/package.nix | 60 ++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_gpu/package.nix b/pkgs/by-name/sd/SDL_gpu/package.nix
index dc52e6afeea7770..d2fb9d98d26e5c5 100644
--- a/pkgs/by-name/sd/SDL_gpu/package.nix
+++ b/pkgs/by-name/sd/SDL_gpu/package.nix
@@ -1,36 +1,52 @@
-{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
+{
+  lib,
+  SDL2,
+  cmake,
+  fetchFromGitHub,
+  libGLU,
+  pkg-config,
+  stdenv,
+}:
 
-stdenv.mkDerivation {
-  pname = "SDL_gpu-unstable";
-  version = "2019-01-24";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "SDL_gpu";
+  version = "0-unstable-2022-06-24";
 
   src = fetchFromGitHub {
     owner = "grimfang4";
     repo = "sdl-gpu";
-    rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef";
-    sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1";
+    rev = "e8ee3522ba0dbe72ca387d978e5f49a9f31e7ba0";
+    hash = "sha256-z1ZuHh9hvno2h+kCKfe+uWa/S6/OLZWWgLZ0zs9HetQ=";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ SDL2 libGLU ];
+  nativeBuildInputs = [
+    SDL2
+    cmake
+    pkg-config
+  ];
+
+  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"
+    (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)
   ];
 
-  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
-  '';
+  outputs = [ "out" "dev" ];
+
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     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;
+    homepage = "https://grimfang4.github.io/sdl-gpu";
+    license = lib.licenses.mit;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ ]);
+    inherit (SDL2.meta) platforms;
   };
-}
+})

From d5bfe1b673f43fa57579e0dbe3c003b13e23e0bf Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:36:09 -0300
Subject: [PATCH 10/49] SDL_image: migrate to by-name

---
 .../SDL_image/default.nix => by-name/sd/SDL_image/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_image/default.nix => by-name/sd/SDL_image/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/by-name/sd/SDL_image/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_image/default.nix
rename to pkgs/by-name/sd/SDL_image/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f8b1140e82387d..4ab03cf9e62fe9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
 
-  SDL_image = callPackage ../development/libraries/SDL_image { };
-
   SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
 
   SDL_net = callPackage ../development/libraries/SDL_net { };

From 43017df2de62bd78565aeefc169ab45ed6e083a5 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 19:14:55 -0300
Subject: [PATCH 11/49] SDL_image: refactor

- finalAttrs
- strictDeps
- split outputs
- sdl team
---
 pkgs/by-name/sd/SDL_image/package.nix | 67 ++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index 30f71bd3e520eae..7d8576bb5662475 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -1,38 +1,69 @@
-{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }:
+{
+  lib,
+  SDL,
+  fetchpatch,
+  fetchurl,
+  giflib,
+  libXpm,
+  libjpeg,
+  libpng,
+  libtiff,
+  pkg-config,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
   version = "1.2.12";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
-    sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
+    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" ];
-      sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7";
+      hash = "sha256-Z0nyEtE1LNGsGsN9SFG8ZyPDdunmvg81tUnEkrJQk5w=";
     })
   ];
 
   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";
+    # 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" ];
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ];
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
+    homepage = "http://www.libsdl.org/projects/SDL_image/";
     description = "SDL image library";
-    homepage    = "http://www.libsdl.org/projects/SDL_image/";
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
-    license     = licenses.zlib;
+    license = lib.licenses.zlib;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ lovek323 ]);
+    inherit (SDL.meta) platforms;
   };
-}
+})

From fe5f696e6826d7f20d388239a0ab9abf08cda9ac Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:30:07 -0300
Subject: [PATCH 12/49] SDL_audiolib: migrate to by-name

---
 .../default.nix => by-name/sd/SDL_audiolib/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_audiolib/default.nix => by-name/sd/SDL_audiolib/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_audiolib/default.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_audiolib/default.nix
rename to pkgs/by-name/sd/SDL_audiolib/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ab03cf9e62fe9b..209f4c85bb8065c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24182,8 +24182,6 @@ with pkgs;
 
   SDL = SDL_classic;
 
-  SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { };
-
   SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
 
   SDL_mixer = callPackage ../development/libraries/SDL_mixer { };

From 69c552c5ed09bfa7ae7d33f6f0af0c6d630df666 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 19:59:51 -0300
Subject: [PATCH 13/49] SDL_audiolib: refactor

- strictDeps
- sdl team
---
 pkgs/by-name/sd/SDL_audiolib/package.nix | 62 +++++++++++++-----------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix
index 9b8a163b206c251..af84b5c0d0dc5a1 100644
--- a/pkgs/by-name/sd/SDL_audiolib/package.nix
+++ b/pkgs/by-name/sd/SDL_audiolib/package.nix
@@ -1,23 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, SDL2
-, pkg-config
+{
+  lib,
+  SDL2,
+  cmake,
+  fetchFromGitHub,
+  pkg-config,
+  stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_audiolib";
-  version = "unstable-2022-04-17";
+  version = "0-unstable-2022-04-17";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = "SDL_audiolib";
     rev = "908214606387ef8e49aeacf89ce848fb36f694fc";
-    sha256 = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A=";
+    hash = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A=";
   };
 
   nativeBuildInputs = [
+    SDL2
     cmake
     pkg-config
   ];
@@ -26,28 +28,32 @@ stdenv.mkDerivation rec {
     SDL2
   ];
 
+  strictDeps = true;
+
   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"
+    (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 = with lib; {
+  meta = {
     description = "Audio decoding, resampling and mixing library for SDL";
     homepage = "https://github.com/realnc/SDL_audiolib";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.lgpl3Plus;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ ]);
+    inherit (SDL2.meta) platforms;
   };
-}
+})

From afffe819ecc7a54ceca8b6f5d8bc89bf83627d77 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:37:41 -0300
Subject: [PATCH 14/49] SDL_sixel: migrate to by-name

---
 .../SDL_sixel/default.nix => by-name/sd/SDL_sixel/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_sixel/default.nix => by-name/sd/SDL_sixel/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/by-name/sd/SDL_sixel/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_sixel/default.nix
rename to pkgs/by-name/sd/SDL_sixel/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 209f4c85bb8065c..babf9f89e83a310 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24182,8 +24182,6 @@ with pkgs;
 
   SDL = SDL_classic;
 
-  SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
-
   SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
 
   SDL_net = callPackage ../development/libraries/SDL_net { };

From f3d1af989411848587e7771f4156c4425bc02414 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:02:57 -0300
Subject: [PATCH 15/49] SDL_sixel: refactor

- fix version
- strictDeps
---
 pkgs/by-name/sd/SDL_sixel/package.nix | 34 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_sixel/package.nix b/pkgs/by-name/sd/SDL_sixel/package.nix
index 189fdee05b26826..7acd03b19f6c904 100644
--- a/pkgs/by-name/sd/SDL_sixel/package.nix
+++ b/pkgs/by-name/sd/SDL_sixel/package.nix
@@ -1,27 +1,39 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }:
+{
+  lib,
+  fetchFromGitHub,
+  libsixel,
+  pkg-config,
+  stdenv,
+}:
 
 stdenv.mkDerivation {
   pname = "SDL_sixel";
-  version = "1.2-nightly";
+  version = "0-unstable-2016-02-06";
 
   src = fetchFromGitHub {
     owner = "saitoha";
     repo = "SDL1.2-SIXEL";
     rev = "ab3fccac6e34260a617be511bd8c2b2beae41952";
-    sha256 = "0gm2vngdac17lzw9azkhzazmfq3byjddms14gqjk18vnynfqp5wp";
+    hash = "sha256-l5eLnfV2ozAlfiTo2pr0a2BXv/pwfpX4pycw1Z7doj4=";
   };
 
-  configureFlags = [ "--enable-video-sixel" ];
-
   nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [ libsixel ];
 
-  meta = with lib; {
-    description = "A cross-platform multimedia library, that supports sixel graphics on consoles";
+  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";
-    homepage    = "https://github.com/saitoha/SDL1.2-SIXEL";
-    maintainers = with maintainers; [ vrthra ];
-    platforms   = platforms.linux;
-    license     = licenses.lgpl21;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ vrthra ]);
+    platforms = lib.platforms.linux;
   };
 }

From 482e1a5a4b55bc5d40aebd3c97d5af62bb096885 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:38:17 -0300
Subject: [PATCH 16/49] SDL_sound: migrate to by-name

---
 .../SDL_sound/default.nix => by-name/sd/SDL_sound/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_sound/default.nix => by-name/sd/SDL_sound/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/by-name/sd/SDL_sound/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_sound/default.nix
rename to pkgs/by-name/sd/SDL_sound/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index babf9f89e83a310..126d8e001b77def 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   SDL_net = callPackage ../development/libraries/SDL_net { };
 
-  SDL_sound = callPackage ../development/libraries/SDL_sound { };
-
   SDL_stretch= callPackage ../development/libraries/SDL_stretch { };
 
   SDL_ttf = callPackage ../development/libraries/SDL_ttf { };

From 01923ef9afb721458ccd44d8522c6def289b8336 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:04:44 -0300
Subject: [PATCH 17/49] SDL_sound: refactor

- finalAttrs
- strictDeps
- sdl team
---
 pkgs/by-name/sd/SDL_sound/package.nix | 48 +++++++++++++++++++++------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix
index bdc97e98f341436..b5e93b3efdf2751 100644
--- a/pkgs/by-name/sd/SDL_sound/package.nix
+++ b/pkgs/by-name/sd/SDL_sound/package.nix
@@ -1,22 +1,48 @@
-{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
+{
+  lib,
+  SDL,
+  fetchurl,
+  flac,
+  libmikmod,
+  libvorbis,
+  stdenv,
+  # Boolean flags
+  enableSdltest ? (!stdenv.isDarwin)
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_sound";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
+    url = "https://icculus.org/SDL_sound/downloads/SDL_sound-${finalAttrs.version}.tar.gz";
+    hash = "sha256-OZn9C7tIUomlK+FLL2i1ccuE44DMQzh+rfd49kx55t8=";
   };
 
-  buildInputs = [ SDL libvorbis flac libmikmod ];
+  nativeBuildInputs = [
+    SDL
+  ];
 
-  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+  buildInputs = [
+    SDL
+    flac
+    libmikmod
+    libvorbis
+  ];
 
-  meta = with lib; {
-    description = "SDL sound library";
-    platforms = platforms.unix;
-    license = licenses.lgpl21;
+  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;
   };
-}
+})

From bfcdb8dbfaf9a77627e1091feb5624cbe5a748ef Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:38:56 -0300
Subject: [PATCH 18/49] SDL_stretch: migrate to by-name

---
 .../default.nix => by-name/sd/SDL_stretch/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_stretch/default.nix => by-name/sd/SDL_stretch/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/by-name/sd/SDL_stretch/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_stretch/default.nix
rename to pkgs/by-name/sd/SDL_stretch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 126d8e001b77def..bfeecc0bf556712 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   SDL_net = callPackage ../development/libraries/SDL_net { };
 
-  SDL_stretch= callPackage ../development/libraries/SDL_stretch { };
-
   SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
 
   SDL2 = callPackage ../development/libraries/SDL2 {

From af8e579938097727c8064ef01c86236e5dd1c73a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:05:26 -0300
Subject: [PATCH 19/49] SDL_stretch: refactor

- finalAttrs
- strictDeps
- sdl team
---
 pkgs/by-name/sd/SDL_stretch/package.nix | 29 +++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_stretch/package.nix b/pkgs/by-name/sd/SDL_stretch/package.nix
index 99f86dd258b3734..f7267b86fd6d67e 100644
--- a/pkgs/by-name/sd/SDL_stretch/package.nix
+++ b/pkgs/by-name/sd/SDL_stretch/package.nix
@@ -1,20 +1,31 @@
-{ lib, stdenv, fetchurl, SDL }:
+{
+  lib,
+  SDL,
+  fetchurl,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_stretch";
   version = "0.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
+    url = "mirror://sourceforge/sdl-stretch/${finalAttrs.version}/SDL_stretch-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-fL8L+rAMPt1uceGH0qLEgncEh4DiySQIuqt7YjUy/Nc=";
   };
 
+  nativeBuildInputs = [ SDL ];
+
   buildInputs = [ SDL ];
 
-  meta = with lib; {
-     description = "Stretch Functions For SDL";
+  strictDeps = true;
+
+  meta = {
      homepage = "https://sdl-stretch.sourceforge.net/";
-     license = licenses.lgpl2;
-     platforms = platforms.linux;
+     description = "Stretch Functions For SDL";
+     license = lib.licenses.lgpl2;
+     maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ ]);
+     inherit (SDL.meta) platforms;
   };
-}
+})

From 28d825fdbe20d6c4faa9fb75b3604f24d6c6836b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 1 May 2024 21:39:19 -0300
Subject: [PATCH 20/49] SDL_ttf: migrate to by-name

---
 .../SDL_ttf/default.nix => by-name/sd/SDL_ttf/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_ttf/default.nix => by-name/sd/SDL_ttf/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_ttf/default.nix
rename to pkgs/by-name/sd/SDL_ttf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfeecc0bf556712..e43d5b743f58efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24186,8 +24186,6 @@ with pkgs;
 
   SDL_net = callPackage ../development/libraries/SDL_net { };
 
-  SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
-
   SDL2 = callPackage ../development/libraries/SDL2 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
   };

From 163163108ea3be9a2c0d4f6abe2974c4dba74582 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:07:19 -0300
Subject: [PATCH 21/49] SDL_ttf: refactor

- finalAttrs
- strictDeps
- sdl team
---
 pkgs/by-name/sd/SDL_ttf/package.nix | 50 +++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index 5d353e3a6c0dd69..9cec49928bea406 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -1,33 +1,55 @@
-{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }:
+{
+  lib,
+  SDL,
+  fetchpatch,
+  fetchurl,
+  freetype,
+  stdenv,
+  # Boolean flags
+  enableSdltest ? (!stdenv.isDarwin),
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_ttf";
   version = "2.0.11";
 
   src = fetchurl {
-    url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
-    sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
+    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/attachment.cgi?id=830";
-      sha256 = "0cfznfzg1hs10wl349z9n8chw80i5adl3iwhq4y102g0xrjyb72d";
+      url = "https://bugzilla-attachments.libsdl.org/attachments/830/renderglyph_shaded.patch.txt";
+      hash = "sha256-TZzlZe7gCRA8wZDHQZsqESAOGbLpJzIoB0HD8L6z3zE=";
     })
   ];
 
   patchFlags = [ "-p0" ];
 
-  buildInputs = [ SDL freetype ];
+  buildInputs = [
+    SDL
+    freetype
+  ];
+
+  nativeBuildInputs = [
+    SDL
+    freetype
+  ];
+
+  configureFlags = [
+    (lib.enableFeature enableSdltest "-sdltest")
+  ];
 
-  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
+    homepage = "https://github.com/libsdl-org/SDL_ttf";
     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 ];
+    license = lib.licenses.zlib;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ abbradar ]);
+    inherit (SDL.meta) platforms;
   };
-}
+})

From b60b370d525b82ab88121f49e221c8ff34065369 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 00:12:24 -0300
Subject: [PATCH 22/49] SDL_mixer: migrate to by-name

---
 .../SDL_mixer/default.nix => by-name/sd/SDL_mixer/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_mixer/default.nix => by-name/sd/SDL_mixer/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_mixer/default.nix
rename to pkgs/by-name/sd/SDL_mixer/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e43d5b743f58efb..890cfeda33ba6a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24182,8 +24182,6 @@ with pkgs;
 
   SDL = SDL_classic;
 
-  SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
-
   SDL_net = callPackage ../development/libraries/SDL_net { };
 
   SDL2 = callPackage ../development/libraries/SDL2 {

From 3682b4386b1e60a60f75836435380eef3bdbc77c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:08:28 -0300
Subject: [PATCH 23/49] SDL_mixer: refactor

- finalAttrs
- strictDeps
- sdl team
- split outputs
---
 pkgs/by-name/sd/SDL_mixer/package.nix | 73 +++++++++++++++++++--------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index 12b50cd476ba92c..4469afcf62f262b 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.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
+  ];
+
+  buildInputs = [
+    SDL
+    fluidsynth
+    libmikmod
+    libogg
+    libvorbis
+    smpeg
+  ];
+
+  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" ];
 
-  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" ];
+  strictDeps = true;
 
-  meta = with lib; {
+  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; [ lovek323 ]);
+    license = lib.licenses.zlib;
+    inherit (SDL.meta) platforms;
   };
-}
+})

From 41724a307380a35642fdd67e3e39ad3938a61798 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 00:12:50 -0300
Subject: [PATCH 24/49] SDL_net: migrate to by-name

---
 .../SDL_net/default.nix => by-name/sd/SDL_net/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL_net/default.nix => by-name/sd/SDL_net/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/by-name/sd/SDL_net/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL_net/default.nix
rename to pkgs/by-name/sd/SDL_net/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 890cfeda33ba6a2..cd52ba07e1c74b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24182,8 +24182,6 @@ with pkgs;
 
   SDL = SDL_classic;
 
-  SDL_net = callPackage ../development/libraries/SDL_net { };
-
   SDL2 = callPackage ../development/libraries/SDL2 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
   };

From 113627be08048763444a93117b2e7be5761a445c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:11:05 -0300
Subject: [PATCH 25/49] SDL_net: refactor

- finalAttrs
- strictDeps
- sdl team
---
 pkgs/by-name/sd/SDL_net/package.nix | 44 +++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_net/package.nix b/pkgs/by-name/sd/SDL_net/package.nix
index e902213c9710f41..4d45ff624e8f93e 100644
--- a/pkgs/by-name/sd/SDL_net/package.nix
+++ b/pkgs/by-name/sd/SDL_net/package.nix
@@ -1,23 +1,43 @@
-{ lib, stdenv, fetchurl, SDL, pkg-config }:
+{
+  lib,
+  SDL,
+  fetchurl,
+  pkg-config,
+  stdenv,
+  # Boolean flags
+  enableSdltest ? (!stdenv.isDarwin)
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_net";
   version = "1.2.8";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
-    sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
+    url = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${finalAttrs.version}.tar.gz";
+    hash = "sha256-X0p6i7iE95PCeKw/NxO+QZgMXu3M7P8CYEETR3FPrLQ=";
   };
 
-  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+  nativeBuildInputs = [
+    SDL
+    pkg-config
+  ];
 
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [ SDL ];
+  propagatedBuildInputs = [
+    SDL
+  ];
 
-  meta = with lib; {
+  configureFlags = [
+    (lib.enableFeature enableSdltest "sdltest")
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://github.com/libsdl-org/SDL_net";
     description = "SDL networking library";
-    platforms = platforms.unix;
-    license = licenses.zlib;
-    homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html";
+    license = lib.licenses.zlib;
+    maintainers =  lib.teams.sdl.members
+                   ++ (with lib.maintainers; [ ]);
+    inherit (SDL.meta) platforms;
   };
-}
+})

From 65f74c2ac1856a924246a443c7ab6b8f075bce33 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 00:15:23 -0300
Subject: [PATCH 26/49] SDL2_ttf: migrate to by-name

---
 .../SDL2_ttf/default.nix => by-name/sd/SDL2_ttf/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL2_ttf/default.nix => by-name/sd/SDL2_ttf/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL2_ttf/default.nix
rename to pkgs/by-name/sd/SDL2_ttf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd52ba07e1c74b3..c2f19b13f05cb52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24213,8 +24213,6 @@ with pkgs;
     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 { };

From c6b17b3071c0a4cfa8802134a64a900a58376f61 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:11:42 -0300
Subject: [PATCH 27/49] SDL2_ttf: refactor

- strictDeps
- use system harfbuzz and freetype instead of vendored
- sdl team
---
 pkgs/by-name/sd/SDL2_ttf/package.nix | 61 +++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix
index 3407478b39b1cd9..b4cda24402377b5 100644
--- a/pkgs/by-name/sd/SDL2_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL2_ttf/package.nix
@@ -1,32 +1,65 @@
-{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }:
+{
+  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/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM=";
   };
 
-  configureFlags = [ "--disable-harfbuzz-builtin" ]
-    ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ];
+  nativeBuildInputs = [
+    SDL2
+    pkg-config
+  ];
 
-  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    SDL2
+    freetype
+    harfbuzz
+  ]
+  ++ lib.optionals (!stdenv.isDarwin) [
+    libGL
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    darwin.libobjc
+  ];
 
-  buildInputs = [ SDL2 freetype harfbuzz ]
-    ++ lib.optional (!stdenv.isDarwin) libGL
-    ++ lib.optional stdenv.isDarwin darwin.libobjc;
+  configureFlags = [
+    (lib.enableFeature false "harfbuzz-builtin")
+    (lib.enableFeature false "freetype-builtin")
+    (lib.enableFeature enableSdltest "sdltest")
+  ];
 
-  passthru.tests.pkg-config = testers.hasPkgConfigModules {
-    package = finalAttrs.finalPackage;
+  strictDeps = true;
+
+  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;
+  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" ];
   };
 })

From 1c5d6dcbc4838da104e80332ae61ed782a2de26c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 08:54:35 -0300
Subject: [PATCH 28/49] SDL2_gfx: migrate to by-name

---
 .../SDL2_gfx/default.nix => by-name/sd/SDL2_gfx/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/SDL2_gfx/default.nix => by-name/sd/SDL2_gfx/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL2_gfx/default.nix
rename to pkgs/by-name/sd/SDL2_gfx/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2f19b13f05cb52..ea61052ce7905ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24207,8 +24207,6 @@ with pkgs;
     };
   });
 
-  SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
-
   SDL2_sound = callPackage ../development/libraries/SDL2_sound {
     inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
   };

From 0d85a83ce1c464c773abbdb4d092ad8246b6bf7a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:12:56 -0300
Subject: [PATCH 29/49] SDL2_gfx: refactor

- get rid of pname
- strictDeps
- split outputs
- sdl team
---
 pkgs/by-name/sd/SDL2_gfx/package.nix | 80 ++++++++++++++++++----------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix
index 83b57b42c7cd184..7c0b5caa68aacd7 100644
--- a/pkgs/by-name/sd/SDL2_gfx/package.nix
+++ b/pkgs/by-name/sd/SDL2_gfx/package.nix
@@ -1,51 +1,75 @@
-{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }:
+{ 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/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
+    url = "http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Y+DgGt3tyd8vhbk6JI8G6KBK/6AUqDXC6jS/405XYmI=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    SDL2
+    pkg-config
+  ];
 
-  buildInputs = [ SDL2 ]
-    ++ lib.optional stdenv.isDarwin darwin.libobjc;
+  buildInputs = [
+    SDL2
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    darwin.libobjc
+  ];
 
-  configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")]
-     ++ lib.optional stdenv.isDarwin "--disable-sdltest";
+  outputs = [ "out" "dev" ];
 
-  passthru.tests.pkg-config = testers.hasPkgConfigModules {
-    package = finalAttrs.finalPackage;
+  configureFlags = [
+    (lib.enableFeature enableMmx "mmx")
+    (lib.enableFeature enableSdltest "sdltest")
+  ];
+
+  strictDeps = true;
+
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+    };
   };
 
-  meta = with lib; {
+  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 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)
+      - 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.
+      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;
+    license = lib.licenses.zlib;
+    maintainers = lib.teams.sdl.members
+                  ++ (with lib.maintainers; [ cpages ]);
     pkgConfigModules = [ "SDL2_gfx" ];
+    inherit (SDL2.meta) platforms;
   };
 })

From 7248ce50bb7e0a49727b3d2b67a5c460ddf53b84 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:14:39 -0300
Subject: [PATCH 30/49] SDL2_Pango: refactor

- finalAttrs
- strictDeps
- splitting
- sdl team
---
 pkgs/by-name/sd/SDL2_Pango/package.nix | 48 ++++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix
index e81d392ca6d61e9..de418804851ec74 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=";
   };
 
-  outputs = [ "out" "dev" ];
-
-  strictDeps = true;
-
   nativeBuildInputs = [
+    SDL2
     autoreconfHook
     pkg-config
-    SDL2
   ];
 
   buildInputs = [
+    SDL2
     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";
+  outputs = [ "out" "dev" ];
+
+  strictDeps = true;
+
+  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;
   };
-}
+})

From af3995746a75b9f0a15cd359a0cac4d78726106c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 09:59:53 -0300
Subject: [PATCH 31/49] SDL2_sound: migrate to by-name

---
 .../default.nix => by-name/sd/SDL2_sound/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/libraries/SDL2_sound/default.nix => by-name/sd/SDL2_sound/package.nix} (100%)

diff --git a/pkgs/development/libraries/SDL2_sound/default.nix b/pkgs/by-name/sd/SDL2_sound/package.nix
similarity index 100%
rename from pkgs/development/libraries/SDL2_sound/default.nix
rename to pkgs/by-name/sd/SDL2_sound/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea61052ce7905ba..a4f49bbb7fff448 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24207,7 +24207,7 @@ with pkgs;
     };
   });
 
-  SDL2_sound = callPackage ../development/libraries/SDL2_sound {
+  SDL2_sound = callPackage ../by-name/sd/SDL2_sound/package.nix {
     inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
   };
 

From 03b72210cf1cd438920b11fdc85faf9e7e08d306 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 3 May 2024 10:01:29 -0300
Subject: [PATCH 32/49] SDL2_sound: internalize `darwin`

---
 pkgs/by-name/sd/SDL2_sound/package.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix        | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix
index 056991c9aca4529..14f57cb49eab185 100644
--- a/pkgs/by-name/sd/SDL2_sound/package.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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4f49bbb7fff448..c52528d6f0e980a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24207,10 +24207,6 @@ with pkgs;
     };
   });
 
-  SDL2_sound = callPackage ../by-name/sd/SDL2_sound/package.nix {
-    inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
-  };
-
   sdrplay = callPackage ../applications/radio/sdrplay { };
 
   sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { };

From a5ca567c5e9cb44dc4b867e9f9dfa9bee6e42efc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 8 May 2024 11:17:49 -0300
Subject: [PATCH 33/49] guile-sdl: migrate to by-name

---
 .../guile-sdl/default.nix => by-name/gu/guile-sdl/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/guile-modules/guile-sdl/default.nix => by-name/gu/guile-sdl/package.nix} (100%)

diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/by-name/gu/guile-sdl/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-sdl/default.nix
rename to pkgs/by-name/gu/guile-sdl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c52528d6f0e980a..6bf10c4b48da620 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17734,7 +17734,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;
   };
 

From 7acf24e0932b2320234ef932658b06f5df6c0e0e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:18:10 -0300
Subject: [PATCH 34/49] guile-sdl: refactor and fixup

- finalAttrs
- Call getDev for all SDL-related build inputs
---
 pkgs/by-name/gu/guile-sdl/package.nix | 54 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix
index 75ca3d8e4aa4db0..27adc43a67aa923 100644
--- a/pkgs/by-name/gu/guile-sdl/package.nix
+++ b/pkgs/by-name/gu/guile-sdl/package.nix
@@ -1,60 +1,62 @@
-{ 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; [ vyp ]);
+    inherit (guile.meta) platforms;
   };
-}
+})

From 51ebfa8f7834f66d7f7ae2b641c343fc86055b83 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:18:21 -0300
Subject: [PATCH 35/49] guile-sdl: unbreak in Darwin

---
 pkgs/by-name/gu/guile-sdl/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix
index 27adc43a67aa923..c8c0085e92b8d4b 100644
--- a/pkgs/by-name/gu/guile-sdl/package.nix
+++ b/pkgs/by-name/gu/guile-sdl/package.nix
@@ -52,8 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.gnu.org/software/guile-sdl/";
     description = "Guile bindings for SDL";
-    # configure: error: *** SDL version  not found!
-    broken = stdenv.isDarwin;
     license = lib.licenses.gpl3Plus;
     maintainers = lib.teams.sdl.members
                   ++ (with lib.maintainers; [ vyp ]);

From fe33007f338f4be2627978f0fdd4e1ee47cb808d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 8 May 2024 11:39:47 -0300
Subject: [PATCH 36/49] vp: migrate to by-name

---
 .../misc/vp/default.nix => by-name/vp/vp/package.nix}      | 0
 pkgs/top-level/all-packages.nix                            | 7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{applications/misc/vp/default.nix => by-name/vp/vp/package.nix} (100%)

diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/by-name/vp/vp/package.nix
similarity index 100%
rename from pkgs/applications/misc/vp/default.nix
rename to pkgs/by-name/vp/vp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bf10c4b48da620..bdfdae32d574060 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14119,10 +14119,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
+  vp = callPackage ../by-name/vp/vp/package.nix {
+    # Enable next line for console graphics. Note that it requires `sixel`
+    # enabled terminals such as mlterm or xterm -ti 340
     SDL = SDL_sixel;
   };
 

From 2113ff8eaee338997a6d43b2744693291538d8a2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:22:05 -0300
Subject: [PATCH 37/49] vp: 1.8 -> 1.8-unstable-2017-03-22

- finalAttrs
- strictDeps
- split outputs
- fix NIX_CFLAGS_COMPILE
- add maintainer AndersonTorres
---
 pkgs/by-name/vp/vp/package.nix  | 48 +++++++++++++++++++++++----------
 pkgs/top-level/all-packages.nix |  6 -----
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix
index 07dbfef2f5f565f..3c3df820127fd96 100644
--- a/pkgs/by-name/vp/vp/package.nix
+++ b/pkgs/by-name/vp/vp/package.nix
@@ -1,28 +1,48 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
+{
+  lib,
+  SDL,
+  SDL_image,
+  autoreconfHook,
+  fetchFromGitHub,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vp";
-  version = "1.8";
+  version = "1.8-unstable-2017-03-22";
 
   src = fetchFromGitHub {
     owner = "erikg";
     repo = "vp";
-    rev = "v${version}";
-    sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq";
+    rev = "52bae15955dbd7270cc906af59bb0fe821a01f27";
+    hash = "sha256-AWRJ//0z97EwvQ00qWDjVeZrPrKnRMOXn4RagdVrcFc=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    SDL
+  ];
 
-  buildInputs = [ SDL SDL_image ];
+  buildInputs = [
+    SDL
+    SDL_image
+  ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL";
+  outputs = [ "out" "man" ];
 
-  meta = with lib; {
-    homepage = "https://brlcad.org/~erik/";
+  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";
-    platforms = platforms.unix;
-    license  = licenses.gpl3;
-    maintainers = [ maintainers.vrthra ];
+    license  = lib.licenses.gpl3Plus;
     mainProgram = "vp";
+    maintainers = with lib.maintainers; [ AndersonTorres vrthra ];
+    inherit (SDL.meta) platforms;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdfdae32d574060..7b70d6fcc410626 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14119,12 +14119,6 @@ with pkgs;
 
   vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
 
-  vp = callPackage ../by-name/vp/vp/package.nix {
-    # Enable next line for console graphics. Note that it requires `sixel`
-    # enabled terminals such as mlterm or xterm -ti 340
-    SDL = SDL_sixel;
-  };
-
   vtm = callPackage ../tools/misc/vtm { };
 
   witness = callPackage ../tools/security/witness { };

From 70c61bd92f750bfdb40f7227bc15702047dad74b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:22:42 -0300
Subject: [PATCH 38/49] vpWithSixel: init

It is just an alias for vp with Sixel support.
---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b70d6fcc410626..9b774d13561a5ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14119,6 +14119,12 @@ with pkgs;
 
   vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
 
+  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;
+  };
+
   vtm = callPackage ../tools/misc/vtm { };
 
   witness = callPackage ../tools/security/witness { };

From 9d630a3eb3780fb8e2398ae957d630479bbf537c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 8 May 2024 13:35:46 -0300
Subject: [PATCH 39/49] onscripter-en: migrate to by-name

---
 .../default.nix => by-name/on/onscripter-en/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/onscripter-en/default.nix => by-name/on/onscripter-en/package.nix} (100%)

diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/by-name/on/onscripter-en/package.nix
similarity index 100%
rename from pkgs/games/onscripter-en/default.nix
rename to pkgs/by-name/on/onscripter-en/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b774d13561a5ac..9498b340dd339d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36960,8 +36960,6 @@ with pkgs;
 
   oilrush = callPackage ../games/oilrush { };
 
-  onscripter-en = callPackage ../games/onscripter-en { };
-
   openarena = callPackage ../games/openarena { };
 
   opendungeons = callPackage ../games/opendungeons { };

From 523f2542111b172b8f979e53e0ad68bf71928dfb Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:36:30 -0300
Subject: [PATCH 40/49] onscripter-en: 20111009 -> 20110930

Not a real update, just a new source and a new maintainer
---
 pkgs/by-name/on/onscripter-en/package.nix | 71 ++++++++++++++++-------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
index edc9e20235ffe47..7178deaca64dcd4 100644
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ b/pkgs/by-name/on/onscripter-en/package.nix
@@ -1,38 +1,67 @@
-{ lib, stdenv, fetchurl
-, libpng, libjpeg, libogg, libvorbis, freetype, smpeg
-, SDL, SDL_image, SDL_mixer, SDL_ttf }:
+{
+  lib,
+  SDL,
+  SDL_image,
+  SDL_mixer,
+  SDL_ttf,
+  fetchFromGitHub,
+  freetype,
+  libjpeg,
+  libogg,
+  libpng,
+  libvorbis,
+  pkg-config,
+  smpeg,
+  stdenv,
+}:
 
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "onscripter-en";
-  version = "20111009";
+  version = "20110930";
 
-  src = fetchurl {
-    # The website is not available now.
-    url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20111009-src.tar.bz2";
-    sha256 = "sha256-pir3ExhehJ9zNygDN83S4GOs5ugDNMjngxEwklAz9c8=";
+  # 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=";
   };
 
-  buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg
-                  SDL SDL_image SDL_mixer SDL_ttf
-                ];
+  nativeBuildInputs = [
+    SDL
+    pkg-config
+    smpeg
+  ];
+
+  buildInputs = [
+    SDL
+    SDL_image
+    SDL_mixer
+    SDL_ttf
+    freetype
+    libjpeg
+    libogg
+    libpng
+    libvorbis
+    smpeg
+  ];
 
   configureFlags = [ "--no-werror" ];
 
-  # Without this libvorbisfile.so is not getting linked properly for some reason.
-  NIX_CFLAGS_LINK = "-lvorbisfile";
+  strictDeps = true;
 
   preBuild = ''
     sed -i 's/.dll//g' Makefile
   '';
 
-  meta = with lib; {
-    broken = stdenv.isDarwin;
+  meta = {
+    homepage = "http://github.com/museoa/onscripter-en";
     description = "Japanese visual novel scripting engine";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "onscripter-en";
-    homepage = "http://unclemion.com/onscripter/";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with lib.maintainers; [ AndersonTorres abbradar ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.isDarwin;
   };
-}
+})

From 10b4bf5fde1de405d58bb99a49733bad0d76a890 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:50:45 -0300
Subject: [PATCH 41/49] btanks: migrate to by-name

---
 .../{games/btanks/default.nix => by-name/bt/btanks/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/btanks/default.nix => by-name/bt/btanks/package.nix} (100%)

diff --git a/pkgs/games/btanks/default.nix b/pkgs/by-name/bt/btanks/package.nix
similarity index 100%
rename from pkgs/games/btanks/default.nix
rename to pkgs/by-name/bt/btanks/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9498b340dd339d4..1c7c52e018a3fdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36451,8 +36451,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;

From b8bbaa85b040eeecce9b393e6cb9cd841cc69c30 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 21:04:15 -0300
Subject: [PATCH 42/49] btanks: adopt (by AndersonTorres) and fixup

- finalAttrs
- strictDeps
---
 pkgs/by-name/bt/btanks/package.nix | 68 ++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/bt/btanks/package.nix b/pkgs/by-name/bt/btanks/package.nix
index f1f2e84a614dd7e..c055e64e664d3e8 100644
--- a/pkgs/by-name/bt/btanks/package.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;
   };
-}
+})

From aca1dd0ea1a3c18e4121b4b8231b4a6bd6468dd1 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 19:18:36 -0300
Subject: [PATCH 43/49] SDL_image: remove lovek323

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/sd/SDL_image/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index 7d8576bb5662475..c49e195f970fff4 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL image library";
     license = lib.licenses.zlib;
     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ lovek323 ]);
+                  ++ (with lib.maintainers; [ ]);
     inherit (SDL.meta) platforms;
   };
 })

From d55409b9303c0265729e98531f9000fa2ed2c20b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:09:04 -0300
Subject: [PATCH 44/49] SDL_mixer: remove lovek323

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/sd/SDL_mixer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index 4469afcf62f262b..470bd5559d7c120 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL_mixer/package.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL multi-channel audio mixer library";
     homepage = "http://www.libsdl.org/projects/SDL_mixer/";
     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ lovek323 ]);
+                  ++ (with lib.maintainers; [ ]);
     license = lib.licenses.zlib;
     inherit (SDL.meta) platforms;
   };

From 8e271cf36d0472b4c93bd3e25c89acfcb8737cfd Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:38:36 -0300
Subject: [PATCH 45/49] SDL_ttf: remove abbradar

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/sd/SDL_ttf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix
index 9cec49928bea406..a44aeaa7f05b2d2 100644
--- a/pkgs/by-name/sd/SDL_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL_ttf/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL TrueType library";
     license = lib.licenses.zlib;
     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ abbradar ]);
+                  ++ (with lib.maintainers; [ ]);
     inherit (SDL.meta) platforms;
   };
 })

From 7ce57cada26a1454179c37998856e1d702a6ef2b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:13:50 -0300
Subject: [PATCH 46/49] SDL2_gfx: remove cpages

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/sd/SDL2_gfx/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix
index 7c0b5caa68aacd7..d74d859fefcbce6 100644
--- a/pkgs/by-name/sd/SDL2_gfx/package.nix
+++ b/pkgs/by-name/sd/SDL2_gfx/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.zlib;
     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ cpages ]);
+                  ++ (with lib.maintainers; [ ]);
     pkgConfigModules = [ "SDL2_gfx" ];
     inherit (SDL2.meta) platforms;
   };

From 1388b97ed0fb5ea4814b254e85f5b268acbc0b47 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:19:00 -0300
Subject: [PATCH 47/49] guile-sdl: remove vyp

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/gu/guile-sdl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix
index c8c0085e92b8d4b..83879b26f7db657 100644
--- a/pkgs/by-name/gu/guile-sdl/package.nix
+++ b/pkgs/by-name/gu/guile-sdl/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Guile bindings for SDL";
     license = lib.licenses.gpl3Plus;
     maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ vyp ]);
+                  ++ (with lib.maintainers; [ ]);
     inherit (guile.meta) platforms;
   };
 })

From c8a16792658384a80d3fa8ccf02cef8e65235061 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:23:55 -0300
Subject: [PATCH 48/49] vp: remove vrthra

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/vp/vp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix
index 3c3df820127fd96..0676ef14f2aa12a 100644
--- a/pkgs/by-name/vp/vp/package.nix
+++ b/pkgs/by-name/vp/vp/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL based picture viewer/slideshow";
     license  = lib.licenses.gpl3Plus;
     mainProgram = "vp";
-    maintainers = with lib.maintainers; [ AndersonTorres vrthra ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
     inherit (SDL.meta) platforms;
   };
 })

From 5b8c9b5dec84dfe72ca103e11fc47004a8a084f0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 10 May 2024 20:37:35 -0300
Subject: [PATCH 49/49] onscripter-en: remove abbradar

See https://github.com/NixOS/nixpkgs/issues/290642.
---
 pkgs/by-name/on/onscripter-en/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
index 7178deaca64dcd4..74b440b427732c8 100644
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ b/pkgs/by-name/on/onscripter-en/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Japanese visual novel scripting engine";
     license = lib.licenses.gpl2Plus;
     mainProgram = "onscripter-en";
-    maintainers = with lib.maintainers; [ AndersonTorres abbradar ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.unix;
     broken = stdenv.isDarwin;
   };