diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-31 14:55:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 14:55:12 -0500 |
| commit | 8020bd6869032e65a55428fa04f2efb81af1e9df (patch) | |
| tree | 0936f9104b135e32d7b4011d8f38f9677f29eaac /pkgs/stdenv/generic | |
| parent | bc84a22989c872bc514a78981eb025fd378af3ca (diff) | |
| parent | a2b606f8e76d807c89a013f57a30e1d5d8d37fad (diff) | |
| download | nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar.gz nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar.bz2 nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar.lz nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar.xz nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.tar.zst nixpkgs-8020bd6869032e65a55428fa04f2efb81af1e9df.zip | |
Merge pull request #35884 from dtzWill/fix/man-in-outputsToInstall
default to including "man" in outputsToInstall
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 1cb5639debe..9ba06995940 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -285,7 +285,8 @@ rec { outputsToInstall = let hasOutput = out: builtins.elem out outputs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outputs) )]; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outputs) )] + ++ lib.optional (hasOutput "man") "man"; } // attrs.meta or {} # Fill `meta.position` to identify the source location of the package. |