diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-09-15 20:33:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 20:33:44 +0200 |
| commit | 79152e307e7eef667c3de9c21571d017654a7c32 (patch) | |
| tree | 67fd413bcf0b42c5ada7eddc41a04f7bd99df3a8 /misc/launchd | |
| parent | 7349f257da8278af9aae35544b15c9a204e2a57b (diff) | |
| parent | 3b82c1a5fef521ebadea5df12384390c8c24100c (diff) | |
Merge pull request #5212 from mkenigs/auto-uid-allocation
Merge master into #3600
Diffstat (limited to 'misc/launchd')
| -rw-r--r-- | misc/launchd/local.mk | 2 | ||||
| -rw-r--r-- | misc/launchd/org.nixos.nix-daemon.plist.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/misc/launchd/local.mk b/misc/launchd/local.mk index 0ba722efb..a39188fe6 100644 --- a/misc/launchd/local.mk +++ b/misc/launchd/local.mk @@ -1,4 +1,4 @@ -ifeq ($(OS), Darwin) +ifdef HOST_DARWIN $(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons)) diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in index 9f26296a9..f1b439840 100644 --- a/misc/launchd/org.nixos.nix-daemon.plist.in +++ b/misc/launchd/org.nixos.nix-daemon.plist.in @@ -4,6 +4,8 @@ <dict> <key>EnvironmentVariables</key> <dict> + <key>NIX_SSL_CERT_FILE</key> + <string>/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt</string> <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key> <string>YES</string> </dict> @@ -17,7 +19,7 @@ <array> <string>/bin/sh</string> <string>-c</string> - <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon</string> + <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon && exec /nix/var/nix/profiles/default/bin/nix-daemon</string> </array> <key>StandardErrorPath</key> <string>/var/log/nix-daemon.log</string> |