* The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but
the package.conf fixup is). svn path=/nixpkgs/trunk/; revision=15100
This commit is contained in:
parent
4cb42e9647
commit
902cf75ca6
@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
|
|||||||
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
|
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
|
||||||
sha256 = "1rd2j7lmcfsm2rdfb5g6q0l8dz3sxadk5m3d2f69d4a6g4p4h7jj";
|
sha256 = "1rd2j7lmcfsm2rdfb5g6q0l8dz3sxadk5m3d2f69d4a6g4p4h7jj";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "i686-darwin" then
|
|
||||||
fetchurl {
|
|
||||||
# update
|
|
||||||
# untested
|
|
||||||
}
|
|
||||||
else throw "cannot bootstrap GHC on this platform";
|
else throw "cannot bootstrap GHC on this platform";
|
||||||
|
|
||||||
buildInputs = [perl makeWrapper];
|
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
|
# 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
|
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
|
cd $TMP
|
||||||
mkdir test-ghc; cd test-ghc
|
mkdir test-ghc; cd test-ghc
|
||||||
cat > main.hs << EOF
|
cat > main.hs << EOF
|
||||||
|
Loading…
x
Reference in New Issue
Block a user