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

Merge pull request #21916 from Profpatsch/ghcWithPackages-docs

Browse Source 
haskell: add doc outputs to with-packages-wrapper.nix
This commit is contained in:
Peter Simons 2017-01-16 10:58:06 +01:00 committed by GitHub
commit 656707ef80
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@ -54,10 +54,12 @@ buildEnv {
# as a dedicated drv attribute, like `compiler-name` # as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages"; name = ghc.name + "-with-packages";
paths = paths ++ [ghc]; paths = paths ++ [ghc];
extraOutputsToInstall = [ "out" "doc" ];
inherit ignoreCollisions; inherit ignoreCollisions;
postBuild = '' postBuild = ''
. ${makeWrapper}/nix-support/setup-hook . ${makeWrapper}/nix-support/setup-hook
# Work around buildEnv sometimes deciding to make bin a symlink
if test -L "$out/bin"; then if test -L "$out/bin"; then
binTarget="$(readlink -f "$out/bin")" binTarget="$(readlink -f "$out/bin")"
rm "$out/bin" rm "$out/bin"
@ -65,6 +67,8 @@ buildEnv {
chmod u+w "$out/bin" chmod u+w "$out/bin"
fi fi
# wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
if [[ -x "${ghc}/bin/$prg" ]]; then if [[ -x "${ghc}/bin/$prg" ]]; then
rm -f $out/bin/$prg rm -f $out/bin/$prg