diff options
Diffstat (limited to 'pkgs/development/libraries/jemalloc')
-rw-r--r-- | pkgs/development/libraries/jemalloc/common.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/jemalloc/default.nix | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index d8866ae3ff89..593f4411f19f 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -12,11 +12,7 @@ stdenv.mkDerivation (rec { # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 40c06cbffdf0..8cb7c1f96733 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, fetchpatch }: import ./common.nix { inherit stdenv fetchurl; - version = "5.0.1"; - sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; - patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; - sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; - }); + version = "5.1.0"; + sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk"; } |