* ghc-pkg wrapper: remove --global; it's not needed and it causes
problems (e.g., with ghc-pkg -s PKGNAME). svn path=/nixpkgs/trunk/; revision=7790
This commit is contained in:
parent
1b290bdb24
commit
279c1e343e
@ -1,11 +1,15 @@
|
|||||||
{stdenv, fetchurl, readline, ghc, perl, m4}:
|
{stdenv, fetchurl, readline, ghc, perl, m4}:
|
||||||
|
|
||||||
stdenv.mkDerivation
|
stdenv.mkDerivation {
|
||||||
{
|
|
||||||
name = "ghc-6.6";
|
name = "ghc-6.6";
|
||||||
|
|
||||||
src = map fetchurl [{ url = http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src.tar.bz2; md5 = "2427a8d7d14f86e0878df6b54938acf7"; }
|
src = map fetchurl [
|
||||||
{ url = http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src-extralibs.tar.bz2; md5 = "14b22fce36caffa509046361724bc119"; }
|
{ url = http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src.tar.bz2;
|
||||||
|
md5 = "2427a8d7d14f86e0878df6b54938acf7";
|
||||||
|
}
|
||||||
|
{ url = http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src-extralibs.tar.bz2;
|
||||||
|
md5 = "14b22fce36caffa509046361724bc119";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
@ -14,5 +18,7 @@ stdenv.mkDerivation
|
|||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
meta = { description = "The Glasgow Haskell Compiler v6.6"; };
|
meta = {
|
||||||
|
description = "The Glasgow Haskell Compiler v6.6";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -17,11 +17,11 @@ makeWrapper() {
|
|||||||
chmod +x "$wrapper"
|
chmod +x "$wrapper"
|
||||||
}
|
}
|
||||||
|
|
||||||
makeWrapper "ghc" "-no-user-package-conf -package-conf" $packages_db
|
makeWrapper "ghc" "-no-user-package-conf -package-conf $packages_db"
|
||||||
makeWrapper "ghci" "-no-user-package-conf -package-conf" $packages_db
|
makeWrapper "ghci" "-no-user-package-conf -package-conf $packages_db"
|
||||||
makeWrapper "runghc" "-no-user-package-conf -package-conf" $packages_db
|
makeWrapper "runghc" "-no-user-package-conf -package-conf $packages_db"
|
||||||
makeWrapper "runhaskell" "-no-user-package-conf -package-conf" $packages_db
|
makeWrapper "runhaskell" "-no-user-package-conf -package-conf $packages_db"
|
||||||
makeWrapper "ghc-pkg" "--global --global-conf" $packages_db
|
makeWrapper "ghc-pkg" "--global-conf $packages_db"
|
||||||
|
|
||||||
# Add wrappers to search path
|
# Add wrappers to search path
|
||||||
export _PATH=$ghc_support:$_PATH
|
export _PATH=$ghc_support:$_PATH
|
||||||
|
Loading…
x
Reference in New Issue
Block a user