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

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

@ -285,7 +285,8 @@ rec {
outputsToInstall = outputsToInstall =
let let
hasOutput = out: builtins.elem out outputs; 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 {} // attrs.meta or {}
# Fill `meta.position` to identify the source location of the package. # Fill `meta.position` to identify the source location of the package.