From 546d0c04608cca449036e987ac0fe401d4cd0135 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 16 Jan 2017 00:13:13 +0100 Subject: [PATCH] haskell: add doc outputs to with-packages-wrapper.nix We want to have all doc outputs as well (also e.g. ghc documentation). Adds a bit of documentation to the postInstall script. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7929d99de153..6a459433a451 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -52,10 +52,12 @@ buildEnv { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + extraOutputsToInstall = [ "out" "doc" ]; inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook + # Work around buildEnv sometimes deciding to make bin a symlink if test -L "$out/bin"; then binTarget="$(readlink -f "$out/bin")" rm "$out/bin" @@ -63,6 +65,8 @@ buildEnv { chmod u+w "$out/bin" fi + # wrap compiler executables with correct env variables + for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do if [[ -x "${ghc}/bin/$prg" ]]; then rm -f $out/bin/$prg