From e53d27e5ded10e24e9621acceae1d6052c3925c8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Oct 2025 09:03:31 +0000 Subject: [PATCH] saga: cleanup --- pkgs/by-name/sa/saga/package.nix | 95 +++++++++++++++++--------------- 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index f935cd93dc36..8b6062988af4 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -1,47 +1,51 @@ { - stdenv, lib, + stdenv, fetchurl, - # native + + # nativeBuildInputs cmake, - desktopToDarwinBundle, dos2unix, pkg-config, wrapGAppsHook3, - # not native - gdal, - wxGTK32, - proj, - libsForQt5, + # darwin-specific + desktopToDarwinBundle, + + # buildInputs curl, - libiodbc, - xz, - libharu, - opencv, - vigra, - pdal, - libpq, - unixODBC, - poppler, - hdf5, - netcdf, - sqlite, - qhull, - giflib, - libsvm, fftw, + gdal, + giflib, + hdf5, + libharu, + libiodbc, + libpq, + libsForQt5, + libsvm, + opencv, + pdal, + proj, + qhull, + vigra, + wxGTK32, + xz, + # darwin-specific + netcdf, + poppler, + sqlite, + unixODBC, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "saga"; version = "9.10.0"; src = fetchurl { - url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; + url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA="; }; - sourceRoot = "saga-${version}/saga-gis"; + sourceRoot = "saga-${finalAttrs.version}/saga-gis"; postPatch = '' dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop @@ -50,37 +54,42 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake dos2unix - wrapGAppsHook3 pkg-config + wrapGAppsHook3 ] - ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ curl - libsForQt5.dxflib fftw - libsvm - hdf5 gdal - wxGTK32 + giflib + hdf5 + libharu + libiodbc + libpq + libsForQt5.dxflib + libsvm + opencv pdal proj - libharu - opencv - vigra - libpq - libiodbc - xz qhull - giflib + vigra + wxGTK32 + xz + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ - unixODBC - poppler netcdf + poppler sqlite + unixODBC ]; cmakeFlags = [ @@ -90,7 +99,7 @@ stdenv.mkDerivation rec { meta = { description = "System for Automated Geoscientific Analyses"; homepage = "https://saga-gis.sourceforge.io"; - changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/"; + changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ michelk @@ -99,4 +108,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = with lib.platforms; unix; }; -} +})