summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorDan Callahan <dan.callahan@gmail.com>2019-10-09 08:51:49 +0100
committerDan Callahan <dan.callahan@gmail.com>2019-10-09 12:52:01 +0100
commit8c4a5e7ba1990348b9497c0fc4dc236dda3e7986 (patch)
tree63be51de9e3071b36139fea7722e0a5acd6ef5c0 /misc
parent7bb5ddbe15beb4c208781f16de074ebcd40d4769 (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.
Diffstat (limited to 'misc')
-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 39d7757a4..9f26296a9 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>