boost-build: fix aarch64 clang cross-compilation

NixOS · Oct 10, 2024 · 90df0c3 · 90df0c3
1 parent c90b083
commit 90df0c3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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
   '';