JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jemalloc nitpick: better semantics for stripPrefix

Browse Source
This commit is contained in:
Vladimír Čunát 2019-01-23 21:01:59 +01:00
parent b3eaad9a27
commit 666870d813
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/jemalloc/common.nix
View File

@ -4,8 +4,8 @@
# then stops downstream builds (mariadb in particular) from detecting it. This # then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc. # option should remove the prefix and give us a working jemalloc.
# Causes segfaults with some software (ex. rustc), but defaults to true for backward # Causes segfaults with some software (ex. rustc), but defaults to true for backward
# compatibility. Ignored on non OSX. # compatibility.
, stripPrefix ? true , stripPrefix ? stdenv.hostPlatform.isDarwin
, disableInitExecTls ? false , disableInitExecTls ? false
}: }:
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# see the comment on stripPrefix # see the comment on stripPrefix
configureFlags = [] configureFlags = []
++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] ++ optional stripPrefix "--with-jemalloc-prefix="
++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] ++ optional disableInitExecTls "--disable-initial-exec-tls"
; ;
doCheck = true; doCheck = true;