diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2016-05-04 19:57:43 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2016-05-04 19:58:05 +0900 |
| commit | 725c85c720d64fd686a34f12f3a2d3f995349926 (patch) | |
| tree | 3af0b6a0a0d1dfe29fe4732732daaf601e16df4b /pkgs/applications/science/math/lp_solve | |
| parent | 5508687ec21ad43baac96443728ccce527954ee7 (diff) | |
| download | nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar.gz nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar.bz2 nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar.lz nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar.xz nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.tar.zst nixlib-725c85c720d64fd686a34f12f3a2d3f995349926.zip | |
lp_solve: fixed build error due to defining isnan
Diffstat (limited to 'pkgs/applications/science/math/lp_solve')
| -rw-r--r-- | pkgs/applications/science/math/lp_solve/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/math/lp_solve/isnan.patch | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index b92691cb6119..733cab7a3ed1 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 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) |