* make ghc use the nix-provided gmp

  - this fixes ghc on x86_64 and hopefully doesn't break 32-bit
  - ghc-6.6.1 and -6.6 are tested on 64-bit, 6.4.2 might fail

svn path=/nixpkgs/trunk/; revision=9132

2 files changed, 4 insertions, 4 deletions

diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index 52c8374f4ac4..50eff51e0630 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, readline, ncurses, gmp ? null}:
+{stdenv, fetchurl, perl, readline, ncurses, gmp}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
              md5 = "8f5fe48798f715cd05214a10987bf6d5";
         });             
   buildInputs = [perl];
-  propagatedBuildInputs = [readline ncurses (if stdenv.system == "x86_64-linux" then gmp else null)];
+  propagatedBuildInputs = [readline ncurses gmp];
   inherit readline ncurses gmp;
 }
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index eea9f4de8c0e..0aeb8086a1d3 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses}:
+{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses, gmp}:
 
 stdenv.mkDerivation {
   name = "ghc-6.4.2";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     md5 = "a394bf14e94c3bca5507d568fcc03375";
   };
   buildInputs = [perl ghc m4];
-  propagatedBuildInputs = [readline ncurses];
+  propagatedBuildInputs = [readline ncurses gmp];
   builder = ./builder.sh;
   inherit gcc;