summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis@nefeli.eu>2018-06-21 21:48:06 +0200
committerDaiderd Jordan <daiderd@gmail.com>2018-08-01 19:40:59 +0200
commit17af73ddd541d2f7860f3766074131af9d4e4a2e (patch)
tree4f35751ba716ca5759b322dafe53b6702a31e054
parent9f18c937710854768ea8d437fe92f5e5bee92a92 (diff)
Fix args passing to execvp
-rw-r--r--modules/services/mail/offlineimap.nix3
-rw-r--r--tests/services-offlineimap.nix2
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/services/mail/offlineimap.nix b/modules/services/mail/offlineimap.nix
index e6a5753..d7228c9 100644
--- a/modules/services/mail/offlineimap.nix
+++ b/modules/services/mail/offlineimap.nix
@@ -51,10 +51,9 @@ in {
environment.etc."offlineimaprc".text = cfg.extraConfig;
launchd.user.agents.offlineimap = {
path = [ cfg.package ];
- command = "offlineimap";
+ command = "${cfg.package}/bin/offlineimap -c /etc/offlineimaprc" + optionalString (cfg.runQuick) " -q";
serviceConfig.KeepAlive = false;
serviceConfig.RunAtLoad = true;
- serviceConfig.ProgramArguments = [ "-c" "/etc/offlineimaprc" ] ++ optional (cfg.runQuick) "-q";
serviceConfig.StartInterval = cfg.startInterval;
serviceConfig.StandardErrorPath = "/var/log/offlineimap.log";
serviceConfig.StandardOutPath = "/var/log/offlineimap.log";
diff --git a/tests/services-offlineimap.nix b/tests/services-offlineimap.nix
index dfbbb57..a88e186 100644
--- a/tests/services-offlineimap.nix
+++ b/tests/services-offlineimap.nix
@@ -34,7 +34,7 @@ in
test = ''
echo >&2 "checking offlineimap service in ~/Library/LaunchAgents"
grep "org.nixos.offlineimap" ${config.out}/user/Library/LaunchAgents/org.nixos.offlineimap.plist
- grep "exec\ offlineimap" ${config.out}/user/Library/LaunchAgents/org.nixos.offlineimap.plist
+ grep "bin/offlineimap" ${config.out}/user/Library/LaunchAgents/org.nixos.offlineimap.plist
grep "\-q" ${config.out}/user/Library/LaunchAgents/org.nixos.offlineimap.plist
echo >&2 "checking config in /etc/offlineimaprc"