nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

unixODBCDrivers.mariadb: 2.0.10 -> 3.1.2

Browse Source
This commit is contained in:
Izorkin 2019-08-17 21:33:43 +03:00
parent 9f8c046849
commit 02812860c8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/unixODBCDrivers/default.nix
View File

@ -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 # I haven't done any parameter tweaking.. So the defaults provided here might be bad
@ -29,18 +29,23 @@
mariadb = stdenv.mkDerivation rec { mariadb = stdenv.mkDerivation rec {
pname = "mariadb-connector-odbc"; pname = "mariadb-connector-odbc";
version = "2.0.10"; version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz"; url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC libmysqlclient ]; buildInputs = [ unixODBC libmysqlclient openssl ];
cmakeFlags = [ cmakeFlags = [
"-DMARIADB_INCLUDE_DIR=${libmysqlclient}/include/mariadb" "-DWITH_OPENSSL=ON"
];
NIX_CFLAGS_COMPILE = [
"-I${libmysqlclient}/include/mysql"
"-L${libmysqlclient}/lib/mysql"
]; ];
passthru = { passthru = {

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

@ -13893,9 +13893,7 @@ in
unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBC = callPackage ../development/libraries/unixODBC { };
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
libmysqlclient = libmysqlclient_2_3;
});
ustr = callPackage ../development/libraries/ustr { }; ustr = callPackage ../development/libraries/ustr { };