b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #35884 from dtzWill/fix/man-in-outputsToInstall

Browse source 
default to including "man" in outputsToInstall
This commit is contained in:
Matthew Bauer 2019-01-31 14:55:12 -05:00 committed by GitHub
parent bc84a22989 a2b606f8e7
commit 8020bd6869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/irc/weechat/wrapper.nix
View file

@ -65,7 +65,7 @@ let
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
'') // {
inherit (weechat) name meta;
inherit (weechat) name;
unwrapped = weechat;
};
in buildEnv {
@ -74,7 +74,7 @@ let
(mkWeechat "weechat")
(mkWeechat "weechat-headless")
];
meta = weechat.meta;
meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ];
};
in lib.makeOverridable wrapper

3
pkgs/stdenv/generic/make-derivation.nix
View file

@ -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.