diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-01 14:18:12 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-08-01 14:18:12 +0300 |
| commit | 0a4562277f04a32582248a4552a90569e25b1daa (patch) | |
| tree | ffa2b2fb738636396152e16a93c49b8b32ec59b6 /pkgs/servers/sql | |
| parent | c8488b913a285b72bb9dc090f2903762b11ac9ce (diff) | |
| download | nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar.gz nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar.bz2 nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar.lz nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar.xz nixlib-0a4562277f04a32582248a4552a90569e25b1daa.tar.zst nixlib-0a4562277f04a32582248a4552a90569e25b1daa.zip | |
mariadb: fix config build mariadb client
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a4d6df2432d3..541db100595d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -16,7 +16,7 @@ libExt = stdenv.hostPlatform.extensions.sharedLibrary; mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]); mariadb = server // { - inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin + inherit client; # MariaDB Client server = server; # MariaDB Server inherit connector-c; # libmysqlclient.so inherit galera; @@ -120,11 +120,14 @@ client = stdenv.mkDerivation (common // { propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc - patches = [ ./cmake-plugin-includedir.patch ]; + patches = common.patches ++ [ + ./cmake-plugin-includedir.patch + ]; cmakeFlags = common.cmakeFlags ++ [ "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" + "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" ]; preConfigure = '' @@ -133,9 +136,8 @@ client = stdenv.mkDerivation (common // { ''; postInstall = common.postInstall + '' - rm -r "$out"/share/mysql rm -r "$out"/share/doc - rm "$out"/bin/{msql2mysql,mysql_plugin,mytop,wsrep_sst_rsync_wan} + rm "$out"/bin/{mytop,wsrep_sst_rsync_wan} rm "$out"/lib/mysql/plugin/daemon_example.ini libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt}) rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} |