diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-26 03:20:29 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-27 11:58:50 +0200 |
| commit | 5feccdc0883476beff328fed368b21d30849704a (patch) | |
| tree | 9b01ee8053bfd6ea7186560ba99487a3d2a31d66 /pkgs/development/libraries/SDL2_mixer | |
| parent | 4c26199ad704f56342526d39aef7cc2ec6e12d10 (diff) | |
| download | nixlib-5feccdc0883476beff328fed368b21d30849704a.tar nixlib-5feccdc0883476beff328fed368b21d30849704a.tar.gz nixlib-5feccdc0883476beff328fed368b21d30849704a.tar.bz2 nixlib-5feccdc0883476beff328fed368b21d30849704a.tar.lz nixlib-5feccdc0883476beff328fed368b21d30849704a.tar.xz nixlib-5feccdc0883476beff328fed368b21d30849704a.tar.zst nixlib-5feccdc0883476beff328fed368b21d30849704a.zip | |
SDL2_mixer: 2.0.1 -> 2.0.2
Diffstat (limited to 'pkgs/development/libraries/SDL2_mixer')
| -rw-r--r-- | pkgs/development/libraries/SDL2_mixer/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2_mixer/libmodplug.patch | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index c0fdbf921a60..6eada0c83e52 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,19 +4,21 @@ stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; - sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; + sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; + preAutoreconf = '' + aclocal + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; - patches = [ ./libmodplug.patch ]; - configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; diff --git a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch deleted file mode 100644 index 63ed2732ebfe..000000000000 --- a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index d511646..77dc3fe 100644 ---- a/configure.in -+++ b/configure.in -@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then - have_libmodplug_lib=yes - ], [dnl - AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes]) -- AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes]) -+ AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes]) - ]) - - if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then |