From 1c9307d348899f98294319476cf25b171463c56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Aug 2016 09:00:12 +0200 Subject: [PATCH] mariadb on Darwin: another attempt to fix Adding jemalloc to buildInputs didn't work out a97df891, as jemalloc doesn't build correctly on Darwin ATM. --- pkgs/servers/sql/mariadb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1d3b4e92ccea..76a7755f3957 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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 = ''