ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

mariadb: complete build on darwin

Browse Source
This commit is contained in:
Jude Taylor 2015-10-28 13:15:28 -07:00
parent 07849565ed
commit 98395a07e9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, ncurses, zlib, openssl, pcre, boost, judy, bison, libxml2 { 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; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ] buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]
++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] ++ 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; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;
@ -52,10 +52,11 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
"-DWITHOUT_TOKUDB=1" "-DWITHOUT_TOKUDB=1"
"-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib"
]; ];
# fails to find lex_token.h sometimes # fails to find lex_token.h sometimes
enableParallelBuilding = false; enableParallelBuilding = stdenv.isDarwin;
outputs = [ "out" "lib" ]; outputs = [ "out" "lib" ];

4
pkgs/top-level/all-packages.nix
View File

@ -9219,7 +9219,9 @@ let
#monetdb = callPackage ../servers/sql/monetdb { }; #monetdb = callPackage ../servers/sql/monetdb { };
mariadb = callPackage ../servers/sql/mariadb {}; mariadb = callPackage ../servers/sql/mariadb {
inherit (darwin) cctools;
};
mongodb = callPackage ../servers/nosql/mongodb { mongodb = callPackage ../servers/nosql/mongodb {
sasl = cyrus_sasl; sasl = cyrus_sasl;