forked from mirrors/nixpkgs
Merge pull request #35884 from dtzWill/fix/man-in-outputsToInstall
default to including "man" in outputsToInstall
This commit is contained in:
commit
8020bd6869
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue