From 725c85c720d64fd686a34f12f3a2d3f995349926 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 4 May 2016 19:57:43 +0900 Subject: [PATCH 1/3] lp_solve: fixed build error due to defining isnan --- pkgs/applications/science/math/lp_solve/default.nix | 7 ++++++- pkgs/applications/science/math/lp_solve/isnan.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/math/lp_solve/isnan.patch diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index b92691cb611..733cab7a3ed 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -10,10 +10,16 @@ stdenv.mkDerivation rec { 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 @@ -37,7 +43,6 @@ stdenv.mkDerivation rec { 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 00000000000..bc1983d4423 --- /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) From 3fa49d5ac424d161baf5a5e952d9be0a803985ab Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 4 May 2016 22:03:22 +0900 Subject: [PATCH 2/3] lp_solve: updated description --- pkgs/applications/science/math/lp_solve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 733cab7a3ed..796faec34e1 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -38,7 +38,7 @@ 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 ]; From f2bab58b3ef2506674ad92aadb2aa8b5058f265b Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 4 May 2016 22:17:37 +0900 Subject: [PATCH 3/3] lp_solve: change source URL to mirror --- pkgs/applications/science/math/lp_solve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 796faec34e1..efa0c1751d4 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -6,7 +6,7 @@ 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"; };