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

Fixes for rebase

Browse Source
This commit is contained in:
Matthew Pickering 2018-08-12 22:13:00 +01:00
parent 5caa3fcae9
commit 8a4661588a
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/gis/saga/finite.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
index c5da854..d3e9cff 100755
--- a/src/modules/imagery/imagery_maxent/me.cpp
+++ b/src/modules/imagery/imagery_maxent/me.cpp
@@ -21,7 +21,7 @@
#ifdef _SAGA_MSW
#define isinf(x) (!_finite(x))
#else
-#define isinf(x) (!finite(x))
+#define isinf(x) (!isfinite(x))
#endif
/** The input array contains a set of log probabilities lp1, lp2, lp3

10
pkgs/applications/gis/saga/lts.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper, { stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa
, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "saga-2.3.2"; name = "saga-2.3.2";
@ -9,14 +9,18 @@ stdenv.mkDerivation rec {
# for why the have additional buildInputs on darwin # for why the have additional buildInputs on darwin
buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra
postgresql libiodbc lzma jasper postgresql libiodbc lzma jasper
unixODBC poppler hdf4.out hdf5 netcdf sqlite ] unixODBC poppler hdf4.out hdf5 netcdf sqlite qhull giflib ]
++ stdenv.lib.optional stdenv.isDarwin Cocoa ; ++ stdenv.lib.optional stdenv.isDarwin Cocoa ;
enableParallelBuilding = true; enableParallelBuilding = true;
GDAL_CFLAGS = "-std=c++11";
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
sourceRoot = "code-b6f474f/saga-gis"; sourceRoot = "code-b6f474f/saga-gis";
patches = [ ./clang_patch.patch ]; patches = [ ./clang_patch.patch ./finite.patch];
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/saga-gis/code.git"; url = "https://git.code.sf.net/p/saga-gis/code.git";