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

mariadb: fix config build mariadb client

Browse Source
This commit is contained in:
Izorkin 2019-08-01 14:18:12 +03:00
parent c8488b913a
commit 0a4562277f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ libExt = stdenv.hostPlatform.extensions.sharedLibrary;
mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]); mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]);
mariadb = server // { mariadb = server // {
inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin inherit client; # MariaDB Client
server = server; # MariaDB Server server = server; # MariaDB Server
inherit connector-c; # libmysqlclient.so inherit connector-c; # libmysqlclient.so
inherit galera; inherit galera;
@ -120,11 +120,14 @@ client = stdenv.mkDerivation (common // {
propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc
patches = [ ./cmake-plugin-includedir.patch ]; patches = common.patches ++ [
./cmake-plugin-includedir.patch
];
cmakeFlags = common.cmakeFlags ++ [ cmakeFlags = common.cmakeFlags ++ [
"-DWITHOUT_SERVER=ON" "-DWITHOUT_SERVER=ON"
"-DWITH_WSREP=OFF" "-DWITH_WSREP=OFF"
"-DINSTALL_MYSQLSHAREDIR=share/mysql-client"
]; ];
preConfigure = '' preConfigure = ''
@ -133,9 +136,8 @@ client = stdenv.mkDerivation (common // {
''; '';
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
rm -r "$out"/share/mysql
rm -r "$out"/share/doc 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 rm "$out"/lib/mysql/plugin/daemon_example.ini
libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt}) libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt})
rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}