diff options
| author | Peter Simons <simons@cryp.to> | 2017-01-16 10:58:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 10:58:06 +0100 |
| commit | 656707ef80a14a5ba85a35bef8c4cc45b9504b1b (patch) | |
| tree | c6a527ed7bd01457caea52320df6dfc624a0900a /pkgs/development/haskell-modules/with-packages-wrapper.nix | |
| parent | ad412ba63af9b83a3007558bcbc24fd180d9cb62 (diff) | |
| parent | 546d0c04608cca449036e987ac0fe401d4cd0135 (diff) | |
| download | nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar.gz nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar.bz2 nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar.lz nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar.xz nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.tar.zst nixlib-656707ef80a14a5ba85a35bef8c4cc45b9504b1b.zip | |
Merge pull request #21916 from Profpatsch/ghcWithPackages-docs
haskell: add doc outputs to with-packages-wrapper.nix
Diffstat (limited to 'pkgs/development/haskell-modules/with-packages-wrapper.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 2dcf206cec94..c49b81762e71 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -54,10 +54,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" @@ -65,6 +67,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 |