b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #239788 from sikmir/saga

Browse source 
saga: misc improvements
This commit is contained in:
Weijia Wang 2023-06-26 13:53:11 +02:00 committed by GitHub
parent 7f62882a59 c4cf696adc
commit 46ed8ef0a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/gis/saga/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv { stdenv
, mkDerivation
, lib , lib
, fetchurl , fetchurl
# native # native
, cmake , cmake
, desktopToDarwinBundle
, pkg-config , pkg-config
# not native # not native
, gdal , gdal
@ -29,12 +29,12 @@
, fftw , fftw
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "saga"; pname = "saga";
version = "9.0.2"; version = "9.0.2";
src = fetchurl { 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="; sha256 = "sha256-dyqunuROQlF1Lo/XsNj9QlN7WbimksfT1s8TrqB9PXE=";
}; };
@ -43,7 +43,7 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
]; ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [ buildInputs = [
curl curl
@ -79,9 +79,9 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "System for Automated Geoscientific Analyses"; description = "System for Automated Geoscientific Analyses";
homepage = "http://www.saga-gis.org"; homepage = "https://saga-gis.sourceforge.io";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ michelk mpickering ]; maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };
} }

3
pkgs/top-level/all-packages.nix
View file

@ -29450,8 +29450,9 @@ with pkgs;
qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
saga = libsForQt5.callPackage ../applications/gis/saga { saga = callPackage ../applications/gis/saga {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (libsForQt5) dxflib;
}; };
spatialite_gui = callPackage ../applications/gis/spatialite-gui { spatialite_gui = callPackage ../applications/gis/spatialite-gui {