diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a74a1590113..daa77c8090c 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -6,20 +6,28 @@ assert openglSupport -> mesa != null;
 assert alsaSupport -> alsaLib != null;
 
 stdenv.mkDerivation {
-  name = "SDL-1.2.11";
+  name = "SDL-1.2.13";
+  
   src = fetchurl {
-    url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
-    md5 = "418b42956b7cd103bfab1b9077ccc149";
+    url = http://www.libsdl.org/release/SDL-1.2.13.tar.gz;
+    sha256 = "0cp155296d6fy3w31jj481jxl9b43fkm01klyibnna8gsvqrvycl";
   };
+  
   propagatedBuildInputs = [x11 libXrandr];
-  buildInputs = 
-    (if openglSupport then [mesa] else []) ++
-    (if alsaSupport then [alsaLib] else []);
-  configureFlags = "
+  
+  buildInputs =
+    stdenv.lib.optional openglSupport mesa ++
+    stdenv.lib.optional alsaSupport alsaLib;
+    
+  configureFlags = ''
     --disable-x11-shared --disable-alsa-shared --enable-rpath
     ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""}
-  ";
-#  patches = [./no-cxx.patch];
-#  NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
-  inherit openglSupport;
+  '';
+
+  passthru = {inherit openglSupport;};
+
+  meta = {
+    description = "A cross-platform multimedia library";
+    homepage = http://www.libsdl.org/;
+  };
 }
diff --git a/pkgs/development/libraries/SDL/no-cxx.patch b/pkgs/development/libraries/SDL/no-cxx.patch
deleted file mode 100644
index bbb0715ce31..00000000000
--- a/pkgs/development/libraries/SDL/no-cxx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rc SDL-1.2.8-orig/src/main/Makefile.in SDL-1.2.8/src/main/Makefile.in
-*** SDL-1.2.8-orig/src/main/Makefile.in	2004-12-13 10:04:02.000000000 +0100
---- SDL-1.2.8/src/main/Makefile.in	2005-07-12 13:24:19.000000000 +0200
-***************
-*** 411,417 ****
-  	  rm -f "$${dir}/so_locations"; \
-  	done
-  libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES) 
-! 	$(CXXLINK)  $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
-  
-  mostlyclean-compile:
-  	-rm -f *.$(OBJEXT)
---- 411,417 ----
-  	  rm -f "$${dir}/so_locations"; \
-  	done
-  libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES) 
-! 	$(LINK)  $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
-  
-  mostlyclean-compile:
-  	-rm -f *.$(OBJEXT)
-Only in SDL-1.2.8/src/main: Makefile.in~