diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-01-02 15:23:17 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-01-02 15:25:06 +0100 |
commit | 02e95ea0b5dc4d62fd1d8cc48e881840b4b07b39 (patch) | |
tree | 2f78f28421923e1efa82eb38dec9e35665b260cf /pkgs/development/libraries/jemalloc | |
parent | 98dd418e8576838a5f7dccaaa7ff0567c76d09f2 (diff) |
jemalloc: do not expose hugepage support as an option
The only common use case so far seems ARMv6/ARMv7 support. The way this option is exposed might collide with a package with the same name. Also the option naming on its own is not self-descriptive without context.
Diffstat (limited to 'pkgs/development/libraries/jemalloc')
-rw-r--r-- | pkgs/development/libraries/jemalloc/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index ee8703a4cf389..d11ec0a782369 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, - # 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 - thpSupport ? !stdenv.isArm }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jemalloc-${version}"; @@ -17,11 +13,12 @@ stdenv.mkDerivation rec { # 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=" - ++ stdenv.lib.optional (!thpSupport) "--disable-thp"; - + # 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.isArm "--disable-thp"; doCheck = true; - meta = with stdenv.lib; { homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; |