diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:37:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:37:41 +0200 |
| commit | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (patch) | |
| tree | 1155f60675070ab417bb59acec82d9f57fb02a61 /pkgs/development/libraries/unixODBCDrivers | |
| parent | 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (diff) | |
| parent | f51c0f66713c8ca5affc59385f2daa14d556b023 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/unixODBCDrivers')
| -rw-r--r-- | pkgs/development/libraries/unixODBCDrivers/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 44e7ed17f0c67..b9aa1696d4878 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -29,23 +29,18 @@ mariadb = stdenv.mkDerivation rec { pname = "mariadb-connector-odbc"; - version = "3.1.2"; + version = "2.0.10"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz"; - sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5"; + url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz"; + sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC libmysqlclient openssl ]; + buildInputs = [ unixODBC mariadb.connector-c ]; cmakeFlags = [ - "-DWITH_OPENSSL=ON" - ]; - - NIX_CFLAGS_COMPILE = [ - "-I${libmysqlclient}/include/mysql" - "-L${libmysqlclient}/lib/mysql" + "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; passthru = { |