diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 02d8a98801e5..ed41431be067 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, x11}:
 
 stdenv.mkDerivation {
-  name = "SDL-1.2.7";
+  name = "SDL-1.2.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/SDL-1.2.7.tar.gz;
-    md5 = "d29b34b6ba3ed213893fc9d8d35e357a";
+    url = http://www.libsdl.org/release/SDL-1.2.8.tar.gz;
+    md5 = "37aaf9f069f9c2c18856022f35de9f8c";
   };
   buildInputs = [x11];
-  patches = [./gcc-3.4.patch];
+  patches = [./no-cxx.patch];
 }
diff --git a/pkgs/development/libraries/SDL/gcc-3.4.patch b/pkgs/development/libraries/SDL/gcc-3.4.patch
deleted file mode 100644
index b8b336cb32cf..000000000000
--- a/pkgs/development/libraries/SDL/gcc-3.4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -rc SDL-orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c
-*** SDL-orig/src/cpuinfo/SDL_cpuinfo.c	2004-02-10 16:31:35.000000000 +0100
---- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c	2004-09-26 18:49:50.000000000 +0200
-***************
-*** 118,124 ****
-  "        movl    %%edi,%%ebx\n"
-  	: "=m" (features)
-  	:
-! 	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-  	);
-  #elif defined(_MSC_VER)
-  	__asm {
---- 118,124 ----
-  "        movl    %%edi,%%ebx\n"
-  	: "=m" (features)
-  	:
-! 	: "%eax", "%ecx", "%edx", "%edi"
-  	);
-  #elif defined(_MSC_VER)
-  	__asm {
-***************
-*** 153,159 ****
-  "        movl    %%edi,%%ebx\n"
-  	: "=m" (features)
-  	:
-! 	: "%eax", "%ebx", "%ecx", "%edx", "%edi"
-  	);
-  #elif defined(_MSC_VER)
-  	__asm {
---- 153,159 ----
-  "        movl    %%edi,%%ebx\n"
-  	: "=m" (features)
-  	:
-! 	: "%eax", "%ecx", "%edx", "%edi"
-  	);
-  #elif defined(_MSC_VER)
-  	__asm {
diff --git a/pkgs/development/libraries/SDL/no-cxx.patch b/pkgs/development/libraries/SDL/no-cxx.patch
new file mode 100644
index 000000000000..bbb0715ce312
--- /dev/null
+++ b/pkgs/development/libraries/SDL/no-cxx.patch
@@ -0,0 +1,21 @@
+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~