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

mariadb.client: fix darwin build

Browse Source 
Fixes #33517
This commit is contained in:
Orivej Desh 2018-01-06 16:29:14 +00:00
parent b94c892137
commit 306eefaa95
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,9 @@ common = rec { # attributes common to both builds
buildInputs = [ buildInputs = [
ncurses openssl zlib pcre jemalloc ncurses openssl zlib pcre jemalloc
] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]
# FIXME: move libiconv outside isDarwin on staging.
++ optional stdenv.isDarwin libiconv;
prePatch = '' prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
@ -122,8 +124,7 @@ everything = stdenv.mkDerivation (common // {
buildInputs = common.buildInputs ++ [ buildInputs = common.buildInputs ++ [
xz lzo lz4 bzip2 snappy xz lzo lz4 bzip2 snappy
libxml2 boost judy libevent cracklib libxml2 boost judy libevent cracklib
] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl;
++ optional stdenv.isDarwin libiconv;
cmakeFlags = common.cmakeFlags ++ [ cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_DATADIR=/var/lib/mysql"