diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
| commit | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch) | |
| tree | bd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/development/pure-modules/glpk/default.nix | |
| parent | dae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff) | |
| parent | 1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff) | |
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/development/pure-modules/glpk/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/pure-modules/glpk/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/pure-modules/glpk/default.nix b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix index 7b615928da9..34d12f1471f 100644 --- a/nixpkgs/pkgs/development/pure-modules/glpk/default.nix +++ b/nixpkgs/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: + pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; + propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${mysql.connector-c}/include/mysql + --replace /usr/include/mysql ${libmysqlclient}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" |