From f97ed85baeb95fc89355d5c803981d30c2729ae5 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 29 Sep 2022 22:45:18 -0400 Subject: [PATCH] jemalloc: fix building emulated x86_64-darwin on aarch64-darwin --- pkgs/development/libraries/jemalloc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index a2812a9c6677..cb734508b340 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { # AArch64 has configurable page size up to 64k. The default configuration # for jemalloc only supports 4k page sizes. ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" + # See https://github.com/jemalloc/jemalloc/issues/1997 + # Using a value of 48 should work on both emulated and native x86_64-darwin. + ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" ; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds";