public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59487 from Ma27/install-weechat-manpages

Browse Source 
weechat: install all outputs into the final store path
This commit is contained in:
Maximilian Bosch 2019-05-24 15:58:30 +02:00 committed by GitHub
commit 822634681e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/irc/weechat/wrapper.nix
View File

@ -6,7 +6,8 @@ weechat:
let let
wrapper = { wrapper = {
configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } installManPages ? true
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
}: }:
let let
@ -65,14 +66,22 @@ 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; inherit (weechat) name man;
unwrapped = weechat; unwrapped = weechat;
outputs = [ "out" "man" ];
}; };
in buildEnv { in buildEnv {
name = "weechat-bin-env-${weechat.version}"; name = "weechat-bin-env-${weechat.version}";
extraOutputsToInstall = lib.optionals installManPages [ "man" ];
paths = [ paths = [
(mkWeechat "weechat") (mkWeechat "weechat")
(mkWeechat "weechat-headless") (mkWeechat "weechat-headless")
(runCommand "weechat-out-except-bin" { } ''
mkdir $out
ln -sf ${weechat}/include $out/include
ln -sf ${weechat}/lib $out/lib
ln -sf ${weechat}/share $out/share
'')
]; ];
meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ]; meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ];
}; };