From b750697c1f537e90476aff0378f1b75add84e497 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 13:27:35 -0500 Subject: [PATCH] glpk: do not hard code include path for libmysqlclient --- pkgs/development/libraries/glpk/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 8c5a50c43d1..124e03baee1 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , fetchpatch +, libmysqlclient # Excerpt from glpk's INSTALL file: # This feature allows the exact simplex solver to use the GNU MP # bignum library. If it is disabled, the exact simplex solver uses the @@ -21,9 +22,11 @@ stdenv.mkDerivation rec { sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; - buildInputs = stdenv.lib.optionals withGmp [ - gmp - ]; + buildInputs = + [ libmysqlclient + ] ++ stdenv.lib.optionals withGmp [ + gmp + ]; configureFlags = stdenv.lib.optionals withGmp [ "--with-gmp" @@ -47,6 +50,13 @@ stdenv.mkDerivation rec { }) ]; + postPatch = + # Do not hardcode the include path for libmysqlclient. + '' + substituteInPlace configure \ + --replace '-I/usr/include/mysql' '$(mysql_config --include)' + ''; + doCheck = true; meta = {