diff options
Diffstat (limited to 'pkgs/applications/gis/saga/default.nix')
-rw-r--r-- | pkgs/applications/gis/saga/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index aa418148209ed..50df22c186c90 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,4 +1,6 @@ { stdenv +, mkDerivation +, lib , fetchurl # native , autoreconfHook @@ -28,13 +30,13 @@ , fftw }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "saga"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM="; }; nativeBuildInputs = [ @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler @@ -76,16 +78,11 @@ stdenv.mkDerivation rec { sqlite ]; - patches = [ - # See https://sourceforge.net/p/saga-gis/bugs/280/ - ./opencv4.patch - ]; - enableParallelBuilding = true; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "System for Automated Geoscientific Analyses"; homepage = "http://www.saga-gis.org"; license = licenses.gpl2Plus; |