From 1138f0a96b3cd46894b059ba135310a1464ce1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 4 Nov 2013 19:37:53 +0100 Subject: [PATCH 1/2] SDL2: update to v2.0.1 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7bc27362a29..79522dbf2cb 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -23,11 +23,11 @@ let ''; in stdenv.mkDerivation rec { - name = "SDL2-2.0.0"; + name = "SDL2-2.0.1"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg"; + sha256 = "1w1jcz7hilk4fl8wlhiwvd1licg8lwy0brqz05562xv7l81fkrqa"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. From b551f8bced96fa069d41007faf5a9eb6f5974e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 4 Nov 2013 19:49:57 +0100 Subject: [PATCH 2/2] SDL2: clean configure flags. I removed some flags that are no longer present, one that was redundant (default value) and added a comment regarding why enable-static is there. --- pkgs/development/libraries/SDL2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 79522dbf2cb..8da6fefd1aa 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -15,10 +15,11 @@ assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> pulseaudio != null; let + # force enable-static, to workaround this bug: + # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 configureFlagsFun = attrs: '' - --disable-oss --disable-video-x11-xme - --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared - --disable-osmesa-shared --enable-static + --enable-static --disable-oss --disable-x11-shared + --disable-pulseaudio-shared --disable-alsa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; in