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

* Fix GHC. The bootstrap binaries depend on libgmp.so.3, which is

Browse Source 
provided by GMP 4 but not GMP 5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31639
This commit is contained in:
Eelco Dolstra 2012-01-18 18:43:34 +00:00
parent e6d6520a56
commit 03fb0e59ef
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/gmp/4.nix
View File

@ -1,10 +1,6 @@
{stdenv, fetchurl, m4, cxx ? true, static ? false}: { stdenv, fetchurl, m4, cxx ? true }:
let stdenv.mkDerivation rec {
staticFlags = if static then " --enable-static --disable-shared" else "";
in
stdenv.mkDerivation (rec {
name = "gmp-4.3.2"; name = "gmp-4.3.2";
src = fetchurl { src = fetchurl {
@ -12,7 +8,7 @@ stdenv.mkDerivation (rec {
sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
}; };
buildNativeInputs = [m4]; buildNativeInputs = [ m4 ];
# Prevent the build system from using sub-architecture-specific # Prevent the build system from using sub-architecture-specific
# instructions (e.g., SSE2 on i686). # instructions (e.g., SSE2 on i686).
@ -25,10 +21,7 @@ stdenv.mkDerivation (rec {
then "ln -sf configfsf.guess config.guess" then "ln -sf configfsf.guess config.guess"
else ''echo "Darwin host is `./config.guess`."''; else ''echo "Darwin host is `./config.guess`."'';
configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") + configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
staticFlags;
dontDisableStatic = if static then true else false;
doCheck = true; doCheck = true;
@ -64,10 +57,3 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

19
pkgs/top-level/all-packages.nix
View File

@ -2119,20 +2119,20 @@ let
}); });
*/ */
ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix { ghc6101Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.1-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit; gmp = gmp4;
}); });
ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix { ghc6102Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.2-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit; gmp = gmp4;
}); });
ghc6121Binary = lowPrio (import ../development/compilers/ghc/6.12.1-binary.nix { ghc6121Binary = lowPrio (callPackage ../development/compilers/ghc/6.12.1-binary.nix {
inherit fetchurl stdenv perl ncurses gmp; gmp = gmp4;
}); });
ghc704Binary = lowPrio (import ../development/compilers/ghc/7.0.4-binary.nix { ghc704Binary = lowPrio (callPackage ../development/compilers/ghc/7.0.4-binary.nix {
inherit fetchurl stdenv perl ncurses gmp; gmp = gmp4;
}); });
# For several compiler versions, we export a large set of Haskell-related # 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; }); 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 { }; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
goffice = callPackage ../development/libraries/goffice { goffice = callPackage ../development/libraries/goffice {