From 3a21d5bce24ce280f052411e7e47aee73d2c4f49 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 27 Feb 2018 10:28:43 -0600 Subject: [PATCH 1/2] default to including "man" in outputsToInstall --- pkgs/stdenv/generic/make-derivation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e8f78d7401f..432a7e33894 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -230,7 +230,8 @@ rec { let outs = outputs'; # the value passed to derivation primitive hasOutput = out: builtins.elem out outs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )] + ++ lib.optional (hasOutput "man") "man"; } // attrs.meta or {} # Fill `meta.position` to identify the source location of the package. From a2b606f8e76d807c89a013f57a30e1d5d8d37fad Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 Jan 2019 14:23:17 -0500 Subject: [PATCH 2/2] weechat: remove outputsToInstall from meta --- pkgs/applications/networking/irc/weechat/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 70628722cba..faf069cebf1 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -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