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

Merge pull request #32174 from lheckemann/weechat-all-default

Browse Source 
weechat: default to enabling all plugins
This commit is contained in:
Jörg Thalheim 2017-11-29 23:02:32 +00:00 committed by GitHub
commit 4657fc893a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/package-notes.xml
View File

@ -667,11 +667,13 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
<section xml:id="sec-weechat"> <section xml:id="sec-weechat">
<title>Weechat</title> <title>Weechat</title>
<para> <para>
Weechat can currently be configured to include your choice of plugins. Weechat can be configured to include your choice of plugins, reducing its
To make use of this functionality, install an expression that overrides its configuration such as 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, ...}: { <programlisting>weechat.override {configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [ python perl ]; plugins = with availablePlugins; [ python perl ];
} }
}</programlisting> }</programlisting>
</para> </para>
<para> <para>

6
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -11,7 +11,7 @@
, rubySupport ? true, ruby , rubySupport ? true, ruby
, tclSupport ? true, tcl , tclSupport ? true, tcl
, extraBuildInputs ? [] , extraBuildInputs ? []
, configure ? null , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
, runCommand }: , runCommand }:
let let
@ -121,9 +121,9 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins ln -s $plugin $out/plugins
done done
''; '';
in writeScriptBin "weechat" '' in (writeScriptBin "weechat" ''
#!${stdenv.shell} #!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir} export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${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/weechat "$@" exec ${weechat}/bin/weechat "$@"
'' '') // { unwrapped = weechat; }