Unverified Commit 46ed8ef0 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #239788 from sikmir/saga 

saga: misc improvements
parents 7f62882a c4cf696a

pkgs/applications/gis/saga/default.nix

+6 −6
Original line number Diff line number Diff line 
{ stdenv

, mkDerivation

, lib

, fetchurl

# native

, cmake

, desktopToDarwinBundle

, pkg-config

# not native

, gdal
@@ -29,12 +29,12 @@ 
, fftw

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "saga";

  version = "9.0.2";



  src = fetchurl {

    url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";

    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";

    sha256 = "sha256-dyqunuROQlF1Lo/XsNj9QlN7WbimksfT1s8TrqB9PXE=";

  };
@@ -43,7 +43,7 @@ mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    pkg-config

  ];

  ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;



  buildInputs = [

    curl
@@ -79,9 +79,9 @@ mkDerivation rec { 


  meta = with lib; {

    description = "System for Automated Geoscientific Analyses";

    homepage = "http://www.saga-gis.org";

    homepage = "https://saga-gis.sourceforge.io";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ michelk mpickering ];

    maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ];

    platforms = with platforms; unix;

  };

}

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -29450,8 +29450,9 @@ with pkgs; 














  qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };



























  saga = libsForQt5.callPackage ../applications/gis/saga {













  saga = callPackage ../applications/gis/saga {















    inherit (darwin.apple_sdk.frameworks) Cocoa;













    inherit (libsForQt5) dxflib;















  };





























  spatialite_gui = callPackage ../applications/gis/spatialite-gui {