From 02e95ea0b5dc4d62fd1d8cc48e881840b4b07b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jan 2018 15:23:17 +0100 Subject: [PATCH] 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. --- pkgs/development/libraries/jemalloc/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index ee8703a4cf3..d11ec0a7823 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";