diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/libraries/unixODBCDrivers/default.nix | |
parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
download | nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/libraries/unixODBCDrivers/default.nix')
-rw-r--r-- | pkgs/development/libraries/unixODBCDrivers/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index b9aa1696d487..44e7ed17f0c6 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, mariadb, 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 mariadb.connector-c ]; + buildInputs = [ unixODBC libmysqlclient openssl ]; cmakeFlags = [ - "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" + "-DWITH_OPENSSL=ON" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libmysqlclient}/include/mysql" + "-L${libmysqlclient}/lib/mysql" ]; passthru = { |