From 90df0c3ed8794b60e95bb105674dd3f6d7f81972 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 24 May 2024 23:03:52 -0400
Subject: [PATCH] boost-build: fix aarch64 clang cross-compilation

---
 pkgs/development/tools/boost-build/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 7a42df1528293..2a82642e778d0 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -36,7 +36,11 @@ stdenv.mkDerivation {
   patches = useBoost.boostBuildPatches or []
     ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch;
 
-  postPatch = lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") ''
+  postPatch = ''
+    # Upstream uses arm64, but nixpkgs uses aarch64.
+    substituteInPlace src/tools/clang.jam \
+      --replace-fail 'arch = arm64' 'arch = aarch64'
+  '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") ''
     patchShebangs --build src/engine/build.sh
   '';