From bfbc0c60cc49f14c6404195fd6eb50c3a5533e19 Mon Sep 17 00:00:00 2001
From: John Soo <john.soo@arista.com>
Date: Tue, 30 Nov 2021 15:33:15 -0800
Subject: [PATCH] darwin-store: Ensure NIX_ROOT is mounted after reboot.

When a darwin host is rebooted, /nix was not mounted.  Let the daemon
also wait until the store mounting service is finished.
---
 misc/launchd/org.nixos.nix-daemon.plist.in |  8 +++-----
 scripts/create-darwin-volume.sh            | 10 +++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in
index 7fec653e0..bc02dc72c 100644
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -13,14 +13,12 @@
     <string>org.nixos.nix-daemon</string>
     <key>KeepAlive</key>
     <dict>
-      <key>PathState</key>
+      <key>OtherJobEnabled</key>
       <dict>
-        <key>/nix/var/nix/profiles/default/bin/nix-daemon</key>
-        <true/>
+        <key>org.nixos.darwin-store</key>
+        <false/>
       </dict>
     </dict>
-    <key>RunAtLoad</key>
-    <true/>
     <key>ProgramArguments</key>
     <array>
       <string>/nix/var/nix/profiles/default/bin/nix-daemon</string>
diff --git a/scripts/create-darwin-volume.sh b/scripts/create-darwin-volume.sh
index 334b75045..f2cf4cba6 100755
--- a/scripts/create-darwin-volume.sh
+++ b/scripts/create-darwin-volume.sh
@@ -303,8 +303,16 @@ generate_mount_daemon() {
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>RunAtLoad</key>
+  <key>LaunchOnlyOnce</key>
   <true/>
+  <key>KeepAlive</key>
+  <dict>
+    <key>PathState</key>
+    <dict>
+      <key>$NIX_ROOT/store</key>
+      <false/>
+    </dict>
+  </dict>
   <key>Label</key>
   <string>org.nixos.darwin-store</string>
   <key>ProgramArguments</key>