From 279c1e343ef016eed1d1a62d5e021fec90801d09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Jan 2007 14:26:50 +0000 Subject: [PATCH] * 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 --- pkgs/development/compilers/ghc-6.6/default.nix | 18 ++++++++++++------ .../compilers/ghc-6.6/setup-hook.sh | 10 +++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/ghc-6.6/default.nix b/pkgs/development/compilers/ghc-6.6/default.nix index ff9c9fc40ec..cfb44dca67d 100644 --- a/pkgs/development/compilers/ghc-6.6/default.nix +++ b/pkgs/development/compilers/ghc-6.6/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl, readline, ghc, perl, m4}: -stdenv.mkDerivation -{ +stdenv.mkDerivation { name = "ghc-6.6"; - src = map fetchurl [{ 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"; } - ]; + src = map fetchurl [ + { 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; @@ -14,5 +18,7 @@ stdenv.mkDerivation setupHook = ./setup-hook.sh; - meta = { description = "The Glasgow Haskell Compiler v6.6"; }; + meta = { + description = "The Glasgow Haskell Compiler v6.6"; + }; } diff --git a/pkgs/development/compilers/ghc-6.6/setup-hook.sh b/pkgs/development/compilers/ghc-6.6/setup-hook.sh index 258c88c4361..23da6de0382 100644 --- a/pkgs/development/compilers/ghc-6.6/setup-hook.sh +++ b/pkgs/development/compilers/ghc-6.6/setup-hook.sh @@ -17,11 +17,11 @@ makeWrapper() { chmod +x "$wrapper" } -makeWrapper "ghc" "-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 "runhaskell" "-no-user-package-conf -package-conf" $packages_db -makeWrapper "ghc-pkg" "--global --global-conf" $packages_db +makeWrapper "ghc" "-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 "runhaskell" "-no-user-package-conf -package-conf $packages_db" +makeWrapper "ghc-pkg" "--global-conf $packages_db" # Add wrappers to search path export _PATH=$ghc_support:$_PATH