public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* make ghc use the nix-provided gmp

Browse Source 
- 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
This commit is contained in:
Andres Löh
2007-08-15 11:25:20 +00:00
parent ec88afcae6
commit 920ce3551d
7 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/boot.nix
+2 -2
View File
@@ -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;
}
pkgs/development/compilers/ghc/default.nix
+2 -2
View File
@@ -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;