From c4cf696adc1562a686e7244e1534eb5a2f6924c2 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 Jun 2023 21:04:33 +0400
Subject: [PATCH] saga: misc improvements, add geospatial team to maintainers

---
 pkgs/applications/gis/saga/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix        |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 00802bb7fe3..4e4d6211b82 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,9 +1,9 @@
 { 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;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbb58db000e..52e146f3031 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29442,8 +29442,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 {