From 24e36bebeb191dbdc9c8083966e41b64f43fb6a2 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 27 Sep 2022 12:24:41 -0400 Subject: [PATCH] arrow-cpp: Fix building x86_64-darwin on aarch_64-darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building x86_64-darwin emulated via Rosetta on aarch64-darwin, all tests would fail with > Illegal instruction: 4 this resolves that by never using Jemalloc on Darwin, since even though `isAarch64` is false, it might “really” be aarch64-darwin. (cherry picked from commit 9764c81130034e9e01efd458560ce2cd95ed7519) --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 5fb8746efae6..ff89e1edc6c5 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -40,7 +40,7 @@ , zstd , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? true -, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) +, enableJemalloc ? !stdenv.isDarwin # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions # see https://github.com/boostorg/process/issues/55