From e1a28002a3a0f0ebbdcf24cc350d20551be517f0 Mon Sep 17 00:00:00 2001
From: r2r-dev <dev@r2r.sh>
Date: Tue, 25 Jan 2022 02:36:41 +0100
Subject: [PATCH] bazel_5: Build xcode-locator selectively for x86_64 (on
 "x86_64-darwin") or arm64 (on "aarch64-darwin")

---
 pkgs/development/tools/build-managers/bazel/bazel_5/default.nix | 2 +-
 .../development/tools/build-managers/bazel/bazel_5/no-arc.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
index f3435169bce8..3148c24c5b0a 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
     # we accept this fact because xcode_locator is only a short-lived process used during the build.
     (substituteAll {
       src = ./no-arc.patch;
-      multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "-arch arm64 -Wl,-no_adhoc_codesign" else "";
+      multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64";
     })
 
     # --experimental_strict_action_env (which may one day become the default
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
index b41e193876dc..95d70a9db38e 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
@@ -9,7 +9,7 @@ index 990afe3e8c..cd5b7b1b7a 100644
 -  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
 -      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
 +  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
-+      -framework Foundation -arch x86_64 @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
++      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
    env -i codesign --identifier $@ --force --sign - $@
  """