From 800fba1037ad97ff5e6d9acf9e820a30f0922f59 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Aug 2019 10:57:09 -0400
Subject: [PATCH 1/2] Use wait4path on org.nixos.nix-daemon.plist

When using a volume, the nix-daemon path may not exist. To avoid this
issue, we must use the wait4path tool. This should solve one of the
issues in multi-user on macOS Catalina.
---
 misc/launchd/org.nixos.nix-daemon.plist.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in
index 92ed12fa5..6bc448d28 100644
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -14,7 +14,12 @@
     <key>RunAtLoad</key>
     <true/>
     <key>Program</key>
-    <string>@bindir@/nix-daemon</string>
+    <string>/bin/sh</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>-c</string>
+      <string>/bin/wait4path @bindir@/nix-daemon &amp;&amp; @bindir@/nix-daemon</string>
+    </array>
     <key>StandardErrorPath</key>
     <string>/var/log/nix-daemon.log</string>
     <key>StandardOutPath</key>

From 87c604c1f04ff31a68f2fa73fe5a2ed9f6ec7ac7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 2 Sep 2019 18:35:10 -0400
Subject: [PATCH 2/2] Fix launchd program args

launchd has some weird syntx. Apparently the program needs to be in
the ProgramArguments, as Program appears to be ignored.
---
 misc/launchd/org.nixos.nix-daemon.plist.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in
index 6bc448d28..b340610e9 100644
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -13,10 +13,9 @@
     <true/>
     <key>RunAtLoad</key>
     <true/>
-    <key>Program</key>
-    <string>/bin/sh</string>
     <key>ProgramArguments</key>
     <array>
+      <string>/bin/sh</string>
       <string>-c</string>
       <string>/bin/wait4path @bindir@/nix-daemon &amp;&amp; @bindir@/nix-daemon</string>
     </array>