forked from mirrors/nixpkgs
unixODBCDrivers.mariadb: 2.0.10 -> 3.1.2
This commit is contained in:
parent
9f8c046849
commit
02812860c8
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
|
||||
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
|
||||
|
||||
# I haven't done any parameter tweaking.. So the defaults provided here might be bad
|
||||
|
||||
|
@ -29,18 +29,23 @@
|
|||
|
||||
mariadb = stdenv.mkDerivation rec {
|
||||
pname = "mariadb-connector-odbc";
|
||||
version = "2.0.10";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
|
||||
sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
|
||||
url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
|
||||
sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ unixODBC libmysqlclient ];
|
||||
buildInputs = [ unixODBC libmysqlclient openssl ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMARIADB_INCLUDE_DIR=${libmysqlclient}/include/mariadb"
|
||||
"-DWITH_OPENSSL=ON"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${libmysqlclient}/include/mysql"
|
||||
"-L${libmysqlclient}/lib/mysql"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -13893,9 +13893,7 @@ in
|
|||
|
||||
unixODBC = callPackage ../development/libraries/unixODBC { };
|
||||
|
||||
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {
|
||||
libmysqlclient = libmysqlclient_2_3;
|
||||
});
|
||||
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
|
||||
|
||||
ustr = callPackage ../development/libraries/ustr { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue