summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-04-16 19:48:11 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-04-16 19:48:11 +0000
commit902cf75ca6dfe20aca859b0bf354719de3e059b3 (patch)
tree2ad9a83d5aaeae7b336cdfbcfef21baee17386fd /pkgs/development/compilers/ghc
parent4cb42e96476007c2b69181c75c84e4ba5653dc50 (diff)
downloadnixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar.gz
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar.bz2
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar.lz
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar.xz
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.tar.zst
nixpkgs-902cf75ca6dfe20aca859b0bf354719de3e059b3.zip
* The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but
  the package.conf fixup is).

svn path=/nixpkgs/trunk/; revision=15100
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/6.10.2-binary.nix8
1 files changed, 1 insertions, 7 deletions
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