saga: migrate to by-name

This commit is contained in:
Nikolay Korotkiy
2024-03-13 18:02:21 +04:00
parent f56b5683c2
commit 628a8f48a8
2 changed files with 5 additions and 10 deletions
@@ -9,7 +9,7 @@
, gdal
, wxGTK32
, proj
, dxflib
, libsForQt5
, curl
, libiodbc
, xz
@@ -17,7 +17,7 @@
, opencv
, vigra
, postgresql
, Cocoa
, darwin
, unixODBC
, poppler
, hdf5
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
dxflib
libsForQt5.dxflib
fftw
libsvm
hdf5
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
++ lib.optionals stdenv.isDarwin [
Cocoa
darwin.apple_sdk.frameworks.Cocoa
unixODBC
poppler
netcdf
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}"
(lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.isDarwin))
];
meta = with lib; {
-5
View File
@@ -29912,11 +29912,6 @@ with pkgs;
qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
saga = callPackage ../applications/gis/saga {
inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (libsForQt5) dxflib;
};
spatialite_gui = callPackage ../applications/gis/spatialite-gui {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
wxGTK = wxGTK32;