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

mariadb-connector-c: drop v2.3

Browse Source
This commit is contained in:
Izorkin 2019-09-09 16:05:01 +03:00
parent c13c903934
commit edf389d92b
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/sql/mariadb/connector-c/2_3.nix
View File

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "2.3.7";
sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
})

12
pkgs/servers/sql/mariadb/connector-c/default.nix
View File

@ -6,10 +6,7 @@
with stdenv.lib; with stdenv.lib;
let stdenv.mkDerivation {
isVer3 = versionAtLeast version "3.0";
in stdenv.mkDerivation {
pname = "mariadb-connector-c"; pname = "mariadb-connector-c";
inherit version; inherit version;
@ -24,7 +21,8 @@ in stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DWITH_EXTERNAL_ZLIB=ON" "-DWITH_EXTERNAL_ZLIB=ON"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
] ++ optional isVer3 "-DWITH_CURL=ON"; "-DWITH_CURL=ON"
];
# The cmake setup-hook uses $out/lib by default, this is not the case here. # The cmake setup-hook uses $out/lib by default, this is not the case here.
preConfigure = optionalString stdenv.isDarwin '' preConfigure = optionalString stdenv.isDarwin ''
@ -32,7 +30,7 @@ in stdenv.mkDerivation {
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ openssl zlib ] ++ optional isVer3 curl; propagatedBuildInputs = [ curl openssl zlib ];
buildInputs = [ libiconv ]; buildInputs = [ libiconv ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -41,12 +39,10 @@ in stdenv.mkDerivation {
ln -sv mariadb_config $out/bin/mysql_config ln -sv mariadb_config $out/bin/mysql_config
ln -sv mariadb $out/lib/mysql ln -sv mariadb $out/lib/mysql
ln -sv mariadb $out/include/mysql ln -sv mariadb $out/include/mysql
${optionalString isVer3 ''
ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
''}
''; '';
meta = { meta = {

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

@ -14887,10 +14887,8 @@ in
rpcbind = callPackage ../servers/rpcbind { }; rpcbind = callPackage ../servers/rpcbind { };
libmysqlclient = libmysqlclient_3_1; libmysqlclient = libmysqlclient_3_1;
libmysqlclient_2_3 = mariadb-connector-c_2_3;
libmysqlclient_3_1 = mariadb-connector-c_3_1; libmysqlclient_3_1 = mariadb-connector-c_3_1;
mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c = mariadb-connector-c_3_1;
mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { };
mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
mariadb-galera = mariadb-galera_25; mariadb-galera = mariadb-galera_25;