diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-02 16:05:45 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-02 16:12:46 -0500 |
| commit | e9156086187b09970e5cdb5178450c73ae59ecd6 (patch) | |
| tree | e0e802fe6d99a2f073f00c0e66719f7d31df92f2 | |
| parent | a77a2cfe4a61c8fda4108fb3670605f04246f857 (diff) | |
| download | nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar.gz nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar.bz2 nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar.lz nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar.xz nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.tar.zst nixpkgs-e9156086187b09970e5cdb5178450c73ae59ecd6.zip | |
haskell/with-packages-wrapper.nix: install "doc" outputs
We were previously just installing the "out" output which broke when we recently changed to generating multiple outputs. Fixes #76837
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 49beed8549d..eb8fad4af1b 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +{ lib, stdenv, ghc, llvmPackages, packages, buildEnv, makeWrapper , withLLVM ? false , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins @@ -51,12 +51,13 @@ let ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else -symlinkJoin { +buildEnv { # this makes computing paths from the name attribute impossible; # if such a feature is needed, the real compiler name should be saved # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + extraOutputsToInstall = ["doc"]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook |