Skip to content

Commit

Permalink
weechat: default to enabling all plugins
Browse files Browse the repository at this point in the history
Plain weechat is still accessible as `weechat.unwrapped`
or `weechat.override {configure = null;}`.

Also update documentation to reflect this change.
  • Loading branch information
lheckemann committed Nov 29, 2017
1 parent 2f1a818 commit 566a16b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions doc/package-notes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -667,11 +667,13 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
<section xml:id="sec-weechat">
<title>Weechat</title>
<para>
Weechat can currently be configured to include your choice of plugins.
To make use of this functionality, install an expression that overrides its configuration such as
Weechat can be configured to include your choice of plugins, reducing its
closure size from the default configuration which includes all available
plugins. To make use of this functionality, install an expression that
overrides its configuration such as
<programlisting>weechat.override {configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [ python perl ];
}
plugins = with availablePlugins; [ python perl ];
}
}</programlisting>
</para>
<para>
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/irc/weechat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
, configure ? null
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
, runCommand }:

let
Expand Down Expand Up @@ -121,9 +121,9 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
in writeScriptBin "weechat" ''
in (writeScriptBin "weechat" ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/weechat "$@"
''
'') // { unwrapped = weechat; }

0 comments on commit 566a16b

Please sign in to comment.