Merge pull request #1171 from cpages/sdl2

Update SDL2 to v2.0.1
This commit is contained in:
Michael Raskin 2013-11-05 20:32:07 -08:00
commit 66c034d03e

View File

@ -15,19 +15,20 @@ assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> pulseaudio != null;
let let
# force enable-static, to workaround this bug:
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
configureFlagsFun = attrs: '' configureFlagsFun = attrs: ''
--disable-oss --disable-video-x11-xme --enable-static --disable-oss --disable-x11-shared
--disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared --disable-pulseaudio-shared --disable-alsa-shared
--disable-osmesa-shared --enable-static
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
''; '';
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "SDL2-2.0.0"; name = "SDL2-2.0.1";
src = fetchurl { src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz"; url = "http://www.libsdl.org/release/${name}.tar.gz";
sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg"; sha256 = "1w1jcz7hilk4fl8wlhiwvd1licg8lwy0brqz05562xv7l81fkrqa";
}; };
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.