diff --git a/pkgs/development/libraries/gmp/4.nix b/pkgs/development/libraries/gmp/4.nix
index 4473e28585d..d25b6941153 100644
--- a/pkgs/development/libraries/gmp/4.nix
+++ b/pkgs/development/libraries/gmp/4.nix
@@ -1,10 +1,6 @@
-{stdenv, fetchurl, m4, cxx ? true, static ? false}:
+{ stdenv, fetchurl, m4, cxx ? true }:
 
-let
-  staticFlags = if static then " --enable-static --disable-shared" else "";
-in
-
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "gmp-4.3.2";
 
   src = fetchurl {
@@ -12,7 +8,7 @@ stdenv.mkDerivation (rec {
     sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
   };
 
-  buildNativeInputs = [m4];
+  buildNativeInputs = [ m4 ];
 
   # Prevent the build system from using sub-architecture-specific
   # instructions (e.g., SSE2 on i686).
@@ -25,10 +21,7 @@ stdenv.mkDerivation (rec {
     then "ln -sf configfsf.guess config.guess"
     else ''echo "Darwin host is `./config.guess`."'';
 
-  configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
-      staticFlags;
-
-  dontDisableStatic = if static then true else false;
+  configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
 
   doCheck = true;
 
@@ -64,10 +57,3 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e0c263c330..a74ed18fd4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2119,20 +2119,20 @@ let
   });
   */
 
-  ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix {
-    inherit fetchurl stdenv perl ncurses gmp libedit;
+  ghc6101Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.1-binary.nix {
+    gmp = gmp4;
   });
 
-  ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
-    inherit fetchurl stdenv perl ncurses gmp libedit;
+  ghc6102Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.2-binary.nix {
+    gmp = gmp4;
   });
 
-  ghc6121Binary = lowPrio (import ../development/compilers/ghc/6.12.1-binary.nix {
-    inherit fetchurl stdenv perl ncurses gmp;
+  ghc6121Binary = lowPrio (callPackage ../development/compilers/ghc/6.12.1-binary.nix {
+    gmp = gmp4;
   });
 
-  ghc704Binary = lowPrio (import ../development/compilers/ghc/7.0.4-binary.nix {
-    inherit fetchurl stdenv perl ncurses gmp;
+  ghc704Binary = lowPrio (callPackage ../development/compilers/ghc/7.0.4-binary.nix {
+    gmp = gmp4;
   });
 
   # For several compiler versions, we export a large set of Haskell-related
@@ -3585,6 +3585,9 @@ let
 
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
+  # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
+  gmp4 = callPackage ../development/libraries/gmp/4.nix { };
+  
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
 
   goffice = callPackage ../development/libraries/goffice {