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

fixed ghc-6.6.1 and darcs

Browse Source 
svn path=/nixpkgs/trunk/; revision=10901
This commit is contained in:
Tobias Hammerschmidt 2008-03-02 08:22:26 +00:00
parent 55fd683572
commit b1ec2a1eb2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghc-6.6.1/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses}: {stdenv, fetchurl, readline, ghc, perl58, m4, gmp, ncurses}:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "ghc-6.6.1"; name = "ghc-6.6.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
} }
]; ];
buildInputs = [ghc readline perl m4 gmp]; buildInputs = [ghc readline perl58 m4 gmp];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
@ -38,6 +38,8 @@ stdenv.mkDerivation (rec {
preConfigure = '' preConfigure = ''
# still requires a hack for ncurses # still requires a hack for ncurses
sed -i "s|^\(library-dirs.*$\)|\1 \"${ncurses}/lib\"|" libraries/readline/package.conf.in sed -i "s|^\(library-dirs.*$\)|\1 \"${ncurses}/lib\"|" libraries/readline/package.conf.in
# fix for gcc 4.2
echo "SplitObjs=NO" >> mk/build.mk
''; '';
inherit (stdenv) gcc; inherit (stdenv) gcc;

4
pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
View File

@ -4,7 +4,7 @@ mkdir -p $ghc_support
# Create isolated package config # Create isolated package config
packages_db=$ghc_support/package.conf packages_db=$ghc_support/package.conf
cp $ghc/lib/ghc-*/package.conf $packages_db cp @out@/lib/ghc-*/package.conf $packages_db
chmod +w $packages_db chmod +w $packages_db
# Generate wrappers for GHC that use the isolated package config # Generate wrappers for GHC that use the isolated package config
@ -13,7 +13,7 @@ makeWrapper() {
wrapper="$ghc_support/$wrapperName" wrapper="$ghc_support/$wrapperName"
shift #the other arguments are passed to the source app shift #the other arguments are passed to the source app
echo '#!'"$SHELL" > "$wrapper" echo '#!'"$SHELL" > "$wrapper"
echo "exec \"$ghc/bin/$wrapperName\" $@" '"$@"' > "$wrapper" echo "exec \"@out@/bin/$wrapperName\" $@" '"$@"' > "$wrapper"
chmod +x "$wrapper" chmod +x "$wrapper"
} }

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

@ -1394,7 +1394,7 @@ rec {
}; };
ghc661 = import ../development/compilers/ghc-6.6.1 { ghc661 = import ../development/compilers/ghc-6.6.1 {
inherit fetchurl stdenv readline perl gmp ncurses; inherit fetchurl stdenv readline perl58 gmp ncurses;
m4 = gnum4; m4 = gnum4;
ghc = ghcboot; ghc = ghcboot;
}; };
@ -4665,7 +4665,8 @@ rec {
}; };
darcs = import ../applications/version-management/darcs { darcs = import ../applications/version-management/darcs {
inherit fetchurl stdenv zlib ncurses curl ghc; inherit fetchurl stdenv zlib ncurses curl;
ghc = ghc661;
}; };
# some speed bottle necks are resolved in this version I think .. perhaps you like to try it? # some speed bottle necks are resolved in this version I think .. perhaps you like to try it?