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

* make ghcboot work on 64-bit

Browse Source 
svn path=/nixpkgs/trunk/; revision=9067
This commit is contained in:
Andres Löh 2007-08-07 23:59:08 +00:00
parent db0e9e16c9
commit 6710a5e02f
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/ghc/boot.nix
View File

@ -1,15 +1,20 @@
{stdenv, fetchurl, perl, readline, ncurses}: {stdenv, fetchurl, perl, readline, ncurses, gmp ? null}:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ghc-6.4.2"; name = "ghc-6.4.2";
builder = ./boot.sh; builder = ./boot.sh;
src = fetchurl { src = if stdenv.system == "i686-linux" then
url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; (fetchurl {
md5 = "092fe2e25dab22b926babe97cc77db1f"; url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
}; md5 = "092fe2e25dab22b926babe97cc77db1f";
}) else
(fetchurl {
url = http://haskell.org/ghc/dist/6.4.2/ghc-6.4.2-x86_64-unknown-linux.tar.bz2;
md5 = "8f5fe48798f715cd05214a10987bf6d5";
});
buildInputs = [perl]; buildInputs = [perl];
propagatedBuildInputs = [readline ncurses]; propagatedBuildInputs = [readline ncurses (if stdenv.system == "x86_64-linux" then gmp else null)];
inherit readline ncurses; inherit readline ncurses gmp;
} }

2
pkgs/development/compilers/ghc/boot.sh
View File

@ -4,7 +4,7 @@ postBuild=postBuild
postBuild () { postBuild () {
find . -type f -perm +100 \ find . -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$readline/lib:$ncurses/lib" {} \; --set-rpath "$readline/lib:$ncurses/lib:$gmp/lib" {} \;
} }
genericBuild genericBuild

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

@ -770,7 +770,8 @@ rec {
ghcboot = lowPrio (appendToName "boot" (import ../development/compilers/ghc/boot.nix { ghcboot = lowPrio (appendToName "boot" (import ../development/compilers/ghc/boot.nix {
inherit fetchurl stdenv perl ncurses; inherit fetchurl stdenv perl ncurses;
readline = readline4; readline = if stdenv.system == "i686-linux" then readline4 else readline;
gmp = if stdenv.system == "x86_64-linux" then gmp else null;
})); }));
/* /*