From 40b9d94a3a92d9c33c1121b026b728a483d3afc8 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Apr 2025 17:39:16 +0200
Subject: [PATCH 1/3] SDL2_mixer: fix configure warnings

---
 pkgs/by-name/sd/SDL2_mixer/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix
index a6e72607cc80..e3a8040a66de 100644
--- a/pkgs/by-name/sd/SDL2_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL2_mixer/package.nix
@@ -14,9 +14,11 @@
   smpeg2,
   stdenv,
   timidity,
+  wavpack,
+  libxmp,
+  game-music-emu,
   # Boolean flags
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
-  enableSmpegtest ? (!stdenv.hostPlatform.isDarwin),
 }:
 
 let
@@ -54,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
     mpg123
     opusfile
     smpeg2
+    wavpack
+    libxmp
+    game-music-emu
     # MIDI patterns
     timidity
   ];
@@ -66,14 +71,11 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   configureFlags = [
-    (lib.enableFeature false "music-ogg-shared")
-    (lib.enableFeature false "music-flac-shared")
     (lib.enableFeature false "music-mod-modplug-shared")
     (lib.enableFeature false "music-mp3-mpg123-shared")
     (lib.enableFeature false "music-opus-shared")
     (lib.enableFeature false "music-midi-fluidsynth-shared")
     (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")
   ];

From 84388782b4a9d532b90b6e49460e73eeee1c723c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Apr 2025 17:39:16 +0200
Subject: [PATCH 2/3] python3Packages.pygame-ce: use latest SDL2_mixer

---
 pkgs/development/python-modules/pygame-ce/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 7cd1dcc35025..40cb2ca28a5b 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -21,7 +21,7 @@
   portmidi,
   SDL2_classic,
   SDL2_classic_image,
-  SDL2_classic_mixer_2_0,
+  SDL2_classic_mixer,
   SDL2_classic_ttf,
   numpy,
 
@@ -101,7 +101,7 @@ buildPythonPackage rec {
     portmidi
     SDL2_classic
     (SDL2_classic_image.override { enableSTB = false; })
-    SDL2_classic_mixer_2_0
+    SDL2_classic_mixer
     SDL2_classic_ttf
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
 

From a5e6bd6c14d49e7a33875234703e749892d4449b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 26 Apr 2025 18:26:40 +0200
Subject: [PATCH 3/3] SDL2_mixer: drop darwin deps

---
 pkgs/by-name/sd/SDL2_mixer/package.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix
index e3a8040a66de..6f5441f3ebf4 100644
--- a/pkgs/by-name/sd/SDL2_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL2_mixer/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   SDL2,
-  darwin,
   fetchFromGitHub,
   flac,
   fluidsynth,
@@ -20,10 +19,6 @@
   # Boolean flags
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
 }:
-
-let
-  inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2_mixer";
   version = "2.8.1";
@@ -40,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    AudioToolbox
-    AudioUnit
-    CoreServices
-  ];
-
   propagatedBuildInputs = [
     SDL2
     flac