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

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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