Merge pull request #964 from kamushadenes/master

Fix NextDNS arguments
LnL7 · Jul 8, 2024 · fabc653 · fabc653
2 parents 0f89b73 + e2a8573
commit fabc653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/services/nextdns/default.nix b/modules/services/nextdns/default.nix
@@ -31,7 +31,7 @@ in {
  launchd.daemons.nextdns = {
  path = [ nextdns ];
  serviceConfig.ProgramArguments =
- [ "${pkgs.nextdns}/bin/nextdns" "run" (escapeShellArgs cfg.arguments) ];
+ [ "${pkgs.nextdns}/bin/nextdns" "run" ] ++ cfg.arguments;
  serviceConfig.KeepAlive = true;
  serviceConfig.RunAtLoad = true;
  };

diff --git a/tests/services-nextdns.nix b/tests/services-nextdns.nix
@@ -12,6 +12,7 @@ in {
  echo >&2 "checking nextdns service in ~/Library/LaunchDaemons"
  grep "org.nixos.nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
  grep "/bin/nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
- grep "'-config' '10.0.3.0/24=abcdef'" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
+ grep -- "-config" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
+ grep "10.0.3.0/24=abcdef" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist
  '';
 }