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

Merge pull request #71776 from Izorkin/connector-c

Browse Source 
mariadb-connector-c: 3.1.2 -> 3.1.4
This commit is contained in:
Robin Gloster 2019-10-23 12:40:36 +02:00 committed by GitHub
commit c48705f537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/mariadb/connector-c/3_1.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./. (args // { callPackage ./. (args // {
version = "3.1.2"; version = "3.1.4";
sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm"; sha256 = "05jkaq151a45rqpyh0vrn6xcpawayfxyzhwn1w32hk0fw3z746ks";
}) })

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

@ -19,9 +19,10 @@ stdenv.mkDerivation {
}; };
cmakeFlags = [ cmakeFlags = [
"-DWITH_EXTERNAL_ZLIB=ON"
"-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DWITH_CURL=ON" "-DWITH_CURL=ON"
"-DWITH_EXTERNAL_ZLIB=ON"
"-DWITH_MYSQLCOMPAT=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.
@ -39,10 +40,6 @@ 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
ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.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_r.so
''; '';
meta = { meta = {