From 98395a07e99faf7a1dd6dfe449c8202a1fbe778b Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 13:15:28 -0700 Subject: [PATCH] mariadb: complete build on darwin --- pkgs/servers/sql/mariadb/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 90372142704b..47a9622bd232 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, ncurses, zlib, openssl, pcre, boost, judy, bison, libxml2 -, libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames +, libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames, cctools }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB=1" + "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" ]; # fails to find lex_token.h sometimes - enableParallelBuilding = false; + enableParallelBuilding = stdenv.isDarwin; outputs = [ "out" "lib" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63df9aa05534..af04786f1172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9219,7 +9219,9 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; - mariadb = callPackage ../servers/sql/mariadb {}; + mariadb = callPackage ../servers/sql/mariadb { + inherit (darwin) cctools; + }; mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl;