* Latest ALSA, SDL.

svn path=/nixpkgs/trunk/; revision=6500

1 files changed, 16 insertions, 10 deletions

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 0d41b13eaea..3a1554e59e6 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchurl, x11, openglSupport ? false, mesa ? null}:
+{ stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null
+, alsaSupport ? true, alsaLib ? null
+}:
 
 assert openglSupport -> mesa != null;
+assert alsaSupport -> alsaLib != null;
 
 stdenv.mkDerivation {
-  name = "SDL-1.2.9";
+  name = "SDL-1.2.11";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.9.tar.gz;
-    md5 = "80919ef556425ff82a8555ff40a579a0";
+    url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
+    md5 = "418b42956b7cd103bfab1b9077ccc149";
   };
-  buildInputs = [
-    x11
-    (if openglSupport then mesa else null)
-  ];
-  patches = [./no-cxx.patch];
-  NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
+  buildInputs = [x11 libXrandr]
+    ++ (if openglSupport then [mesa] else [])
+    ++ (if alsaSupport then [alsaLib] else []);
+  configureFlags = "
+    --disable-x11-shared --disable-alsa-shared --enable-rpath
+    ${if alsaSupport then "--with-alsa-prefix=${alsaLib}" else ""}
+  ";
+#  patches = [./no-cxx.patch];
+#  NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
   inherit openglSupport;
 }