diff options
author | yvt <i@yvt.jp> | 2021-10-15 09:48:15 +0900 |
---|---|---|
committer | yvt <i@yvt.jp> | 2021-10-15 09:48:15 +0900 |
commit | a9d9e5555118025032eabd9612e03473a97ebff8 (patch) | |
tree | fe8ee8e8c52d4d6ba1795c36d5721241ac0667f0 /src/libstore/globals.cc | |
parent | 4c0cde95ad8dc95f876e5cf32790e73e08f49b28 (diff) |
Add another path where a Rosetta 2 configuration file is possibly located
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r-- | src/libstore/globals.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 6934801e3..4903d0922 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -148,7 +148,8 @@ StringSet Settings::getDefaultExtraPlatforms() // machines. Note that we can’t force processes from executing // x86_64 in aarch64 environments or vice versa since they can // always exec with their own binary preferences. - if (pathExists("/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist")) { + if (pathExists("/Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist") || + pathExists("/System/Library/LaunchDaemons/com.apple.oahd.plist")) { if (std::string{SYSTEM} == "x86_64-darwin") extraPlatforms.insert("aarch64-darwin"); else if (std::string{SYSTEM} == "aarch64-darwin") |