mariadb: replace to connector-c
This commit is contained in:
parent
9213a2cf66
commit
4ef619dadd
|
@ -37,10 +37,10 @@
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ unixODBC mariadb.lib ];
|
||||
buildInputs = [ unixODBC mariadb.connector-c ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql"
|
||||
"-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl,
|
||||
pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }:
|
||||
pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
baseName = "glpk";
|
||||
|
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
glpkWithExtras = lib.overrideDerivation glpk (attrs: {
|
||||
propagatedBuildInputs = [ gmp libtool libmysql libiodbc ];
|
||||
propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
|
||||
|
||||
CPPFLAGS = "-I${gmp.dev}/include";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure \
|
||||
--replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql
|
||||
--replace /usr/include/mysql ${mysql.connector-c}/include/mariadb
|
||||
'';
|
||||
configureFlags = [ "--enable-dl"
|
||||
"--enable-odbc"
|
||||
|
|
Loading…
Reference in a new issue