alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Install the package config files under

Browse source 
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
  $out/nix-support/ghc-package.conf.  This makes them visible in the
  user's profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
This commit is contained in:
Eelco Dolstra 2009-04-18 20:24:36 +00:00
parent 4ce5419f17
commit ffcd38403e
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/ghc/setup-hook.sh
View file

@ -7,10 +7,11 @@ export GHC_PACKAGE_PATH=$packages_db
# Env hook to add packages to the package config
addLibToPackageConf () {
local confFile=$1/nix-support/ghc-package.conf
if test -f $confFile; then
@ghc@/bin/ghc-pkg register $confFile
fi
local fn
shopt -s nullglob
for fn in $1/lib/ghc-pkgs/ghc-@ghcVersion@/*.conf; do
@ghc@/bin/ghc-pkg register $fn
done
}
envHooks=(${envHooks[@]} addLibToPackageConf)

1
pkgs/development/compilers/ghc/wrapper.nix
View file

@ -11,4 +11,5 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh;
inherit ghc;
ghcVersion = ghc.version;
}

5
pkgs/development/libraries/haskell/cabal/cabal.nix
View file

@ -79,8 +79,9 @@ attrs :
./Setup copy
ensureDir $out/nix-support
./Setup register --gen-pkg-config=$out/nix-support/ghc-package.conf
local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
ensureDir $confDir
./Setup register --gen-pkg-config=$confDir/${self.fname}.conf
eval "$postInstall"
'';

10
pkgs/top-level/haskell-packages.nix
View file

@ -1,12 +1,18 @@
{pkgs, ghc}:
let ghcOrig = ghc; in
let ghcReal = ghc; in
rec {
inherit ghcReal;
# In the remainder, `ghc' refers to the wrapper. This is because
# it's never useful to use the wrapped GHC (`ghcReal'), as the
# wrapper provides essential functionality: the ability to find
# Haskell packages in the buildInputs automatically.
ghc = import ../development/compilers/ghc/wrapper.nix {
inherit (pkgs) stdenv;
ghc = ghcOrig;
ghc = ghcReal;
};
cabal = import ../development/libraries/haskell/cabal/cabal.nix {