diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-09T01·17-0400 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-01-04T13·06+0100 |
| commit | 7a011ded77adf828158bccb467a8a2e2af8434c4 (patch) | |
| tree | d15038d48e2b2e4a44e9cc510befd1882d8cacd7 | |
| parent | eacc510572785e64b45051cb4fda6fc4d072dbe6 (diff) | |
Copy instead of linking launch agent
On Catalina, the /nix filesystem might not be mounted at start time. To avoid this service not starting, we need to keep the launch agent outside of the Nix store. A wait4pid will hold for our /nix dir to be mounted. Fixes #3125. (cherry picked from commit 0847f2f1b3145a62dc34707ba788275ce6b6fc57)
| -rw-r--r-- | misc/launchd/org.nixos.nix-daemon.plist.in | 2 | ||||
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in index b340610e900c..39d7757a4e0e 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 && @bindir@/nix-daemon</string> + <string>/bin/wait4path @bindir@/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon</string> </array> <key>StandardErrorPath</key> <string>/var/log/nix-daemon.log</string> diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 87c4c2b0582a..49076bd5c03f 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -39,7 +39,7 @@ EOF poly_configure_nix_daemon_service() { _sudo "to set up the nix-daemon as a LaunchDaemon" \ - ln -sfn "/nix/var/nix/profiles/default$PLIST_DEST" "$PLIST_DEST" + cp -f "/nix/var/nix/profiles/default$PLIST_DEST" "$PLIST_DEST" _sudo "to load the LaunchDaemon plist for nix-daemon" \ launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist |