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

Merge branch 'master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-08-13 16:59:55 +02:00
parent fa3a35b241 79149ac12d
commit bd4490e277
106 changed files with 3736 additions and 2595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/sql/mariadb/default.nix
View File

@@ -32,8 +32,8 @@ common = rec { # attributes common to both builds
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
ncurses openssl zlib pcre jemalloc
] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
ncurses openssl zlib pcre
] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
cmakeFlags = [
@@ -51,6 +51,7 @@ common = rec { # attributes common to both builds
"-DWITH_PCRE=system"
]
++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
++ optional (!stdenv.isLinux) "-DWITH_JEMALLOC=no" # bad build at least on Darwin
;
preConfigure = ''