max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-13 01:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4444 from matthewbauer/unset-curproc-arch-affinity

Browse source 
Set kern.curproc_arch_affinity=0 to escape Rosetta
This commit is contained in:
Eelco Dolstra 2021-01-13 12:16:53 +01:00 committed by GitHub
commit 4e9cec79bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build/derivation-goal.cc
View file

@ -52,6 +52,7 @@
#if __APPLE__ #if __APPLE__
#include <spawn.h> #include <spawn.h>
#include <sys/sysctl.h>
#endif #endif
#include <pwd.h> #include <pwd.h>
@ -2865,6 +2866,10 @@ void DerivationGoal::runChild()
throw SysError("failed to initialize builder"); throw SysError("failed to initialize builder");
if (drv->platform == "aarch64-darwin") { if (drv->platform == "aarch64-darwin") {
// Unset kern.curproc_arch_affinity so we can escape Rosetta
int affinity = 0;
sysctlbyname("kern.curproc_arch_affinity", NULL, NULL, &affinity, sizeof(affinity));
cpu_type_t cpu = CPU_TYPE_ARM64; cpu_type_t cpu = CPU_TYPE_ARM64;
posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
} else if (drv->platform == "x86_64-darwin") { } else if (drv->platform == "x86_64-darwin") {