diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-23 21:01:59 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-23 21:01:59 +0100 |
| commit | 666870d81320f2f733af28d97a860888a27039f0 (patch) | |
| tree | e21490cdffdacdcc6e251a7505e0c55a8c9cfa54 /pkgs/development/libraries/jemalloc | |
| parent | b3eaad9a27534052196aad91ab7d1c56ee7bd66c (diff) | |
| download | nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar.gz nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar.bz2 nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar.lz nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar.xz nixpkgs-666870d81320f2f733af28d97a860888a27039f0.tar.zst nixpkgs-666870d81320f2f733af28d97a860888a27039f0.zip | |
jemalloc nitpick: better semantics for stripPrefix
Diffstat (limited to 'pkgs/development/libraries/jemalloc')
| -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 6e83b9637c1..487af4ae97a 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; |