diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2018-09-07 18:29:07 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-09-07 18:41:04 +0200 |
commit | e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e (patch) | |
tree | 7fcc337246cdf2de27a2db3037a191d3028e7d2c /pkgs/applications/networking/irc | |
parent | 6f3ff5acc77bf2848c3151a3674e0f5912a304c8 (diff) | |
download | nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar.gz nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar.bz2 nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar.lz nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar.xz nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.tar.zst nixlib-e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e.zip |
weechat: fix quoting for ${} syntax
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.
Diffstat (limited to 'pkgs/applications/networking/irc')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index eaf7410a3171..a9de275559db 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -133,13 +133,13 @@ in if configure == null then weechat else scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) [ ] (config.scripts or [])); - in "${scripts}\n${init}"; + in "${scripts};${init}"; mkWeechat = bin: (writeScriptBin bin '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${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; unwrapped = weechat; |