diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index a6e72607cc808..6f5441f3ebf47 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, @@ -14,14 +13,12 @@ smpeg2, stdenv, timidity, + wavpack, + libxmp, + game-music-emu, # Boolean flags enableSdltest ? (!stdenv.hostPlatform.isDarwin), - enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; version = "2.8.1"; @@ -38,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; - propagatedBuildInputs = [ SDL2 flac @@ -54,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { mpg123 opusfile smpeg2 + wavpack + libxmp + game-music-emu # MIDI patterns timidity ]; @@ -66,14 +60,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") ]; diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 7cd1dcc35025d..40cb2ca28a5bf 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 ];