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

weechat: fix quoting for ${} syntax

Browse Source 
In my previous PR I missed that ${sec.foobar} (syntax to retrieve
secrets in a weechat runtime) breaks the shell evaluation.

Furthermore `;` shall be used rather than `\n` to concat scripts and the
init config.
This commit is contained in:
Maximilian Bosch 2018-09-07 18:29:07 +02:00
parent 6f3ff5acc7
commit e2b4644f9c
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,13 +133,13 @@ in if configure == null then weechat else
scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
[ ] (config.scripts or [])); [ ] (config.scripts or []));
in "${scripts}\n${init}"; in "${scripts};${init}";
mkWeechat = bin: (writeScriptBin bin '' mkWeechat = bin: (writeScriptBin bin ''
#!${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/${bin} "$@" --run-command "${init}" exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
'') // { '') // {
inherit (weechat) name meta; inherit (weechat) name meta;
unwrapped = weechat; unwrapped = weechat;