diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-06 16:29:14 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-01-06 16:31:42 +0000 |
| commit | 306eefaa95aa4be433e126aa1c3f9e04ea5b8430 (patch) | |
| tree | caa7c60faeb536e478a424d78e41593ee397a009 /pkgs/servers/sql | |
| parent | b94c892137c70802a4dd3f0f21d3753c889e1185 (diff) | |
| download | nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar.gz nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar.bz2 nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar.lz nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar.xz nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.tar.zst nixlib-306eefaa95aa4be433e126aa1c3f9e04ea5b8430.zip | |
mariadb.client: fix darwin build
Fixes #33517
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 547edafa8ad0..f5dc11011d7c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -28,7 +28,9 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc ] ++ 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 = '' 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 ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl - ++ optional stdenv.isDarwin libiconv; + ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" |