diff --git a/pkgs/stdenv-linux/gcc-wrapper.sh b/pkgs/stdenv-linux/gcc-wrapper.sh
index 9e1b26698bb..66dc5b348be 100644
--- a/pkgs/stdenv-linux/gcc-wrapper.sh
+++ b/pkgs/stdenv-linux/gcc-wrapper.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/local/bin/bash
 
 IFS=
 
diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh
index fa2de05e5a2..d12d2786b7d 100755
--- a/pkgs/subversion/subversion-build.sh
+++ b/pkgs/subversion/subversion-build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
+export NIX_LDFLAGS="-Wl,-s -pthread"
 
 . $stdenv/setup || exit 1
 
@@ -21,6 +21,7 @@ if test $httpServer; then
 fi
 
 if test $pythonBindings; then
+    export PYTHON=$python/bin/python
     extraflags="--with-swig=$swig $extraflags"
 fi
 
diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix
index 90e158dfd63..3d246df4e83 100644
--- a/pkgs/subversion/subversion.fix
+++ b/pkgs/subversion/subversion.fix
@@ -20,6 +20,7 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
     , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
     , ("ssl", If(Var("httpsClient"), IncludeFix("openssl/openssl.fix"), ""))
     , ("swig", If(Var("pythonBindings"), IncludeFix("swig/swig.fix"), ""))
+    , ("python", "/usr/local")
     , ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
     , ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
     , ("libxml", IncludeFix("libxml2/libxml2.fix"))
diff --git a/pkgs/swig/swig-build.sh b/pkgs/swig/swig-build.sh
index 8f954c8eae8..b769fdbd64e 100755
--- a/pkgs/swig/swig-build.sh
+++ b/pkgs/swig/swig-build.sh
@@ -6,6 +6,6 @@ export NIX_LDFLAGS=-Wl,-s
 
 tar xvfz $src || exit 1
 cd SWIG-* || exit 1
-./configure --prefix=$out || exit 1
-gmake || exit 1
-gmake install || exit 1
+./configure --prefix=$out --with-python=$python/bin/python || exit 1
+/usr/local/bin/gmake || exit 1
+/usr/local/bin/gmake install || exit 1
diff --git a/pkgs/swig/swig.fix b/pkgs/swig/swig.fix
index 88555c6f29c..6ee68210a4f 100644
--- a/pkgs/swig/swig.fix
+++ b/pkgs/swig/swig.fix
@@ -8,5 +8,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+
+  , ("python", "/usr/local")
   ]
 )