diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index f41114889d5..326e93ea569 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -76,4 +76,4 @@ stdenv.mkDerivation ( {
     tkSupport = (tk != null) && (tcl != null);
     libPrefix = "python2.5";
   } ;
-} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; } else {} ) )
+} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )
diff --git a/pkgs/development/interpreters/python/2.5/nolongdouble.patch b/pkgs/development/interpreters/python/2.5/nolongdouble.patch
new file mode 100644
index 00000000000..8fb53da3d49
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.5/nolongdouble.patch
@@ -0,0 +1,20 @@
+diff -rc Python-2.5.4/configure Python-2.5.4-new/configure
+*** Python-2.5.4/configure	Sat Dec 13 15:13:52 2008
+--- Python-2.5.4-new/configure	Fri Jul 24 16:38:05 2009
+***************
+*** 4534,4540 ****
+  	    ;;
+  	# is there any other compiler on Darwin besides gcc?
+  	Darwin*)
+! 	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+  	    if test "${enable_universalsdk}"; then
+  		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+  	    fi
+--- 4534,4540 ----
+  	    ;;
+  	# is there any other compiler on Darwin besides gcc?
+  	Darwin*)
+! 	    BASECFLAGS="$BASECFLAGS -no-cpp-precomp -mno-fused-madd"
+  	    if test "${enable_universalsdk}"; then
+  		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+  	    fi