From ae322db745cf252ddeecc2c451ba9340483f6989 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 10:13:19 +0100 Subject: [PATCH] SDL2_mixer: enable midi by default, cleanup package Co-authored-by: Nikolay Amiantov --- .../libraries/SDL2_mixer/default.nix | 58 ++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index c90c0fd08a8..af0da7dc627 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,7 +1,19 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which -, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123 -, CoreServices, AudioUnit, AudioToolbox -, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv +, fetchurl +, pkg-config +, AudioToolbox +, AudioUnit +, CoreServices +, SDL2 +, flac +, fluidsynth +, libmodplug +, libogg +, libvorbis +, mpg123 +, opusfile +, smpeg2 +}: stdenv.mkDerivation rec { pname = "SDL2_mixer"; @@ -12,19 +24,37 @@ stdenv.mkDerivation rec { sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; - preAutoreconf = '' - aclocal - ''; + nativeBuildInputs = [ pkg-config ]; - nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + AudioToolbox + AudioUnit + CoreServices + ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + propagatedBuildInputs = [ + SDL2 + flac + fluidsynth + libmodplug + libogg + libvorbis + mpg123 + opusfile + smpeg2 + ]; - propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ]; - - configureFlags = [ "--disable-music-ogg-shared" ] - ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl" - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; + configureFlags = [ + "--disable-music-ogg-shared" + "--disable-music-flac-shared" + "--disable-music-mod-modplug-shared" + "--disable-music-mp3-mpg123-shared" + "--disable-music-opus-shared" + "--disable-music-midi-fluidsynth-shared" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "--disable-sdltest" + "--disable-smpegtest" + ]; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library";