pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #239788 from sikmir/saga

saga: misc improvements

authored by

Weijia Wang and committed by
GitHub 46ed8ef0 7f62882a

+8 -7
+6 -6
pkgs/applications/gis/saga/default.nix
··· 1 1 { stdenv 2 - , mkDerivation 3 2 , lib 4 3 , fetchurl 5 4 # native 6 5 , cmake 6 + , desktopToDarwinBundle 7 7 , pkg-config 8 8 # not native 9 9 , gdal ··· 29 29 , fftw 30 30 }: 31 31 32 - mkDerivation rec { 32 + stdenv.mkDerivation rec { 33 33 pname = "saga"; 34 34 version = "9.0.2"; 35 35 36 36 src = fetchurl { 37 - url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; 37 + url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; 38 38 sha256 = "sha256-dyqunuROQlF1Lo/XsNj9QlN7WbimksfT1s8TrqB9PXE="; 39 39 }; 40 40 ··· 43 43 nativeBuildInputs = [ 44 44 cmake 45 45 pkg-config 46 - ]; 46 + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; 47 47 48 48 buildInputs = [ 49 49 curl ··· 79 79 80 80 meta = with lib; { 81 81 description = "System for Automated Geoscientific Analyses"; 82 - homepage = "http://www.saga-gis.org"; 82 + homepage = "https://saga-gis.sourceforge.io"; 83 83 license = licenses.gpl2Plus; 84 - maintainers = with maintainers; [ michelk mpickering ]; 84 + maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ]; 85 85 platforms = with platforms; unix; 86 86 }; 87 87 }
+2 -1
pkgs/top-level/all-packages.nix
··· 29450 29450 29451 29451 qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; 29452 29452 29453 - saga = libsForQt5.callPackage ../applications/gis/saga { 29453 + saga = callPackage ../applications/gis/saga { 29454 29454 inherit (darwin.apple_sdk.frameworks) Cocoa; 29455 + inherit (libsForQt5) dxflib; 29455 29456 }; 29456 29457 29457 29458 spatialite_gui = callPackage ../applications/gis/spatialite-gui {