diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-01-24 00:19:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-24 00:19:32 +0100 |
commit | 328b0e49332d7e60c62535f489a16b13a625823a (patch) | |
tree | be7c42ece844b875db45cb77c6d0cac5e4aee767 | |
parent | 7222fd9e21a41d4f00556700986ce5190c878f6f (diff) | |
parent | 666870d81320f2f733af28d97a860888a27039f0 (diff) | |
download | nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar.gz nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar.bz2 nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar.lz nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar.xz nixlib-328b0e49332d7e60c62535f489a16b13a625823a.tar.zst nixlib-328b0e49332d7e60c62535f489a16b13a625823a.zip |
Merge pull request #54512 from vcunat/p/jemalloc-stripPrefix
jemalloc nitpick: better semantics for stripPrefix
-rw-r--r-- | pkgs/development/libraries/jemalloc/common.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 6e83b9637c16..487af4ae97a5 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -4,8 +4,8 @@ # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. # Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. Ignored on non OSX. -, stripPrefix ? true +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin , disableInitExecTls ? false }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # see the comment on stripPrefix configureFlags = [] - ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] - ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" ; doCheck = true; |