diff options
| author | Nikodem Rabuliński <nikodem@rabulinski.com> | 2024-05-06 18:16:50 +0200 |
|---|---|---|
| committer | Nikodem Rabuliński <nikodem@rabulinski.com> | 2024-05-07 20:43:17 +0200 |
| commit | f894cce79b05913891c8356948b5fc468a53c198 (patch) | |
| tree | 7e1dd11419e6a524fc92d6cc2b0a462c86da6315 | |
| parent | 83a2cd0c469f02a7d5f8f8f903429702f0059f56 (diff) | |
Always initialize curl in parent process on darwin
Because of an objc quirk[1], calling curl_global_init for the first time
after fork() will always result in a crash.
Up until now the solution has been to set
OBJC_DISABLE_INITIALIZE_FORK_SAFETY for every nix process to ignore
that error.
This is less than ideal because we were setting it in package.nix,
which meant that running nix tests locally would fail because
that variable was not set.
Instead of working around that error we address it at the core -
by calling curl_global_init inside initLibStore, which should mean
curl will already have been initialized by the time we try to do so in
a forked process.
[1] https://github.com/apple-oss-distributions/objc4/blob/01edf1705fbc3ff78a423cd21e03dfc21eb4d780/runtime/objc-initialize.mm#L614-L636
Change-Id: Icf26010a8be655127cc130efb9c77b603a6660d0
| -rw-r--r-- | misc/launchd/org.nixos.nix-daemon.plist.in | 5 | ||||
| -rw-r--r-- | package.nix | 4 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in index e1470cf99..664608305 100644 --- a/misc/launchd/org.nixos.nix-daemon.plist.in +++ b/misc/launchd/org.nixos.nix-daemon.plist.in @@ -2,11 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>EnvironmentVariables</key> - <dict> - <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key> - <string>YES</string> - </dict> <key>Label</key> <string>org.nixos.nix-daemon</string> <key>KeepAlive</key> diff --git a/package.nix b/package.nix index 455e21135..af0a44fee 100644 --- a/package.nix +++ b/package.nix @@ -400,10 +400,6 @@ stdenv.mkDerivation (finalAttrs: { mesonInstallCheckFlags = [ "--suite=installcheck" ]; - preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - ''; - installCheckPhase = lib.optionalString buildWithMeson '' runHook preInstallCheck flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}") diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index b7397da1a..3308cad1f 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -25,6 +25,7 @@ #include "config-impl.hh" #ifdef __APPLE__ +#include <curl/curl.h> #include <sys/sysctl.h> #endif @@ -409,10 +410,21 @@ void initLibStore() { preloadNSS(); +#if __APPLE__ + /* Because of an objc quirk[1], calling curl_global_init for the first time + after fork() will always result in a crash. + Up until now the solution has been to set OBJC_DISABLE_INITIALIZE_FORK_SAFETY + for every nix process to ignore that error. + Instead of working around that error we address it at the core - + by calling curl_global_init here, which should mean curl will already + have been initialized by the time we try to do so in a forked process. + + [1] https://github.com/apple-oss-distributions/objc4/blob/01edf1705fbc3ff78a423cd21e03dfc21eb4d780/runtime/objc-initialize.mm#L614-L636 + */ + curl_global_init(CURL_GLOBAL_ALL); /* On macOS, don't use the per-session TMPDIR (as set e.g. by sshd). This breaks build users because they don't have access to the TMPDIR, in particular in ‘nix-store --serve’. */ -#if __APPLE__ if (getEnv("TMPDIR").value_or("/tmp").starts_with("/var/folders/")) unsetenv("TMPDIR"); #endif |