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

mariadb: replace to connector-c

This commit is contained in:
Izorkin 2017-12-22 19:12:05 +03:00 committed by Robin Gloster
parent 9213a2cf66
commit 4ef619dadd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,10 +37,10 @@
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC mariadb.lib ]; buildInputs = [ unixODBC mariadb.connector-c ];
cmakeFlags = [ cmakeFlags = [
"-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql" "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
]; ];
preConfigure = '' preConfigure = ''

6
pkgs/development/pure-modules/glpk/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, { lib, stdenv, fetchurl,
pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "glpk"; baseName = "glpk";
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
}; };
glpkWithExtras = lib.overrideDerivation glpk (attrs: { glpkWithExtras = lib.overrideDerivation glpk (attrs: {
propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
CPPFLAGS = "-I${gmp.dev}/include"; CPPFLAGS = "-I${gmp.dev}/include";
preConfigure = '' preConfigure = ''
substituteInPlace configure \ substituteInPlace configure \
--replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql --replace /usr/include/mysql ${mysql.connector-c}/include/mariadb
''; '';
configureFlags = [ "--enable-dl" configureFlags = [ "--enable-dl"
"--enable-odbc" "--enable-odbc"