diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-09-07 19:02:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 19:02:41 +0200 |
| commit | c04198a99285f9a6701e80665d5fa9e633e34b72 (patch) | |
| tree | 1c50800f32dbe91de2fa6331d0014293451fb1c5 | |
| parent | b11cfc26224f9fc6ab4bdd83b90e766fe3deb1b9 (diff) | |
| parent | e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e (diff) | |
| download | nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar.gz nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar.bz2 nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar.lz nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar.xz nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.tar.zst nixlib-c04198a99285f9a6701e80665d5fa9e633e34b72.zip | |
Merge pull request #46324 from Ma27/weechat-script-fixes
weechat: fix quoting for ${} syntax| -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; |