diff options
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/math/lp_solve/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/science/math/lp_solve/isnan.patch | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index b92691cb6119..efa0c1751d4c 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -6,14 +6,20 @@ stdenv.mkDerivation rec { version = "5.5.2.0"; src = fetchurl { - url = "http://sourceforge.net/projects/lpsolve/files/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; + url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq"; }; + patches = [ ./isnan.patch ]; + buildCommand = '' . $stdenv/setup tar xvfz $src ( + cd lp_solve* + eval patchPhase + ) + ( cd lp_solve*/lpsolve55 bash ccc mkdir -pv $out/lib @@ -32,12 +38,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver"; + description = "A Mixed Integer Linear Programming (MILP) solver"; homepage = "http://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/science/math/lp_solve/isnan.patch b/pkgs/applications/science/math/lp_solve/isnan.patch new file mode 100644 index 000000000000..bc1983d4423d --- /dev/null +++ b/pkgs/applications/science/math/lp_solve/isnan.patch @@ -0,0 +1,13 @@ +diff -u a/lp_lib.h b/lp_lib.h +--- a/lp_lib.h 2016-05-04 19:45:15.753143720 +0900 ++++ b/lp_lib.h 2016-05-04 19:53:59.536920722 +0900 +@@ -59,9 +59,6 @@ + # if defined _WIN32 && !defined __GNUC__ + # define isnan _isnan + # endif +-#if defined NOISNAN +-# define isnan(x) FALSE +-#endif + + #define SETMASK(variable, mask) variable |= mask + #define CLEARMASK(variable, mask) variable &= ~(mask) |