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

Merge pull request #46324 from Ma27/weechat-script-fixes

Browse Source 
weechat: fix quoting for ${}  syntax
This commit is contained in:
Timo Kaufmann 2018-09-07 19:02:41 +02:00 committed by GitHub
commit c04198a992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;