From 4e5b3131740dade56b643a568a9d26bbe4b796ea Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Dec 2016 21:15:02 +0100
Subject: [PATCH] services.activate-system: retry if activation fails

this might fail a few times when /nix/store is on another filesystem.
---
 modules/services/activate-system.nix | 5 +++--
 modules/services/nix-daemon.nix      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/services/activate-system.nix b/modules/services/activate-system.nix
index 106c7ba..03742a1 100644
--- a/modules/services/activate-system.nix
+++ b/modules/services/activate-system.nix
@@ -38,10 +38,11 @@ in
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
 
-    launchd.daemons.activate-system = mkIf cfg.enable {
+    launchd.daemons.activate-system = {
       serviceConfig.Program = "${activateScript}";
+      serviceConfig.KeepAlive.SuccessfulExit = false;
       serviceConfig.RunAtLoad = true;
     };
 
diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix
index 262ac3c..2d64bc5 100644
--- a/modules/services/nix-daemon.nix
+++ b/modules/services/nix-daemon.nix
@@ -39,9 +39,9 @@ in
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
 
-    launchd.daemons.nix-daemon = mkIf cfg.enable {
+    launchd.daemons.nix-daemon = {
       serviceConfig.Program = "${cfg.profile}/bin/nix-daemon";
       serviceConfig.KeepAlive = true;
       serviceConfig.ProcessType = "Background";