diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-13 09:00:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-13 09:03:33 +0200 |
| commit | 1c9307d348899f98294319476cf25b171463c56b (patch) | |
| tree | 6996a95a994145c77e6757745952f9f7901f9120 /pkgs/servers | |
| parent | eafdae9fd5bb777f1252ab451bf9b59ca7cf6df3 (diff) | |
| download | nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar.gz nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar.bz2 nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar.lz nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar.xz nixpkgs-1c9307d348899f98294319476cf25b171463c56b.tar.zst nixpkgs-1c9307d348899f98294319476cf25b171463c56b.zip | |
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.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1d3b4e92cce..76a7755f395 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 = '' |