about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDan Callahan <dan.callahan@gmail.com>2019-10-09T07·51+0100
committerEelco Dolstra <edolstra@gmail.com>2020-01-04T13·07+0100
commit34bf1a8b5fce79b4e5e286f3bf005243e102fe37 (patch)
tree1beaa1ae247bb02339ad1cdff8be08d0b9f5c889
parent7a011ded77adf828158bccb467a8a2e2af8434c4 (diff)
Make nix-daemon.plist less fragile on macOS
We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.

That means we're hardcoding something like:

    /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon

That seems unnecessarily fragile.

It might be better to wait4path on the path we intend to call.

(cherry picked from commit 8c4a5e7ba1990348b9497c0fc4dc236dda3e7986)
-rw-r--r--misc/launchd/org.nixos.nix-daemon.plist.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in
index 39d7757a4e0e..9f26296a9d7b 100644
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -17,7 +17,7 @@
     <array>
       <string>/bin/sh</string>
       <string>-c</string>
-      <string>/bin/wait4path @bindir@/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon</string>
+      <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon</string>
     </array>
     <key>StandardErrorPath</key>
     <string>/var/log/nix-daemon.log</string>