Merge pull request #5388 from yvt/fix-oahd-path

Add another path where a Rosetta 2 daemon plist file is possibly located
NixOS · Oct 15, 2021 · c574ab3 · c574ab3
2 parents 330650d + a9d9e55
commit c574ab3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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")