summary refs log tree commit diff
diff options
context:
space:
mode:
authorWinter <winter@winter.cafe>2022-09-29 22:45:18 -0400
committerWinter <winter@winter.cafe>2022-09-29 22:45:18 -0400
commitf97ed85baeb95fc89355d5c803981d30c2729ae5 (patch)
tree32d2ca1dd701746585f565a6b308d6742da6765f
parent6bcaf7ee4f4130725ff3d093ee0ff243f3af3dcd (diff)
downloadnixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar.gz
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar.bz2
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar.lz
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar.xz
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.tar.zst
nixpkgs-f97ed85baeb95fc89355d5c803981d30c2729ae5.zip
jemalloc: fix building emulated x86_64-darwin on aarch64-darwin
-rw-r--r--pkgs/development/libraries/jemalloc/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index a2812a9c667..cb734508b34 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";