From 902cf75ca6dfe20aca859b0bf354719de3e059b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Apr 2009 19:48:11 +0000 Subject: * The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but the package.conf fixup is). svn path=/nixpkgs/trunk/; revision=15100 --- pkgs/development/compilers/ghc/6.10.2-binary.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'pkgs/development/compilers/ghc') diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index a6d60d9953b..8f3b6833fa1 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "1rd2j7lmcfsm2rdfb5g6q0l8dz3sxadk5m3d2f69d4a6g4p4h7jj"; } - else if stdenv.system == "i686-darwin" then - fetchurl { - # update - # untested - } else throw "cannot bootstrap GHC on this platform"; buildInputs = [perl makeWrapper]; @@ -90,8 +85,7 @@ stdenv.mkDerivation rec { # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf - wrapProgram $out/bin/ghc --set LDPATH "${gmp}/lib" - # sanity check, can ghc create executables? + # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc cat > main.hs << EOF -- cgit 1.4.1