diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2024-03-13 18:02:21 +0400 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@disroot.org> | 2024-03-13 18:02:21 +0400 |
| commit | 628a8f48a8f20e2ea4a30e6936a723bc77ab3d67 (patch) | |
| tree | 0374a7f8232706b0ae5ac9733c2e97f9ee2e579e /pkgs | |
| parent | f56b5683c2dd27079d185a41ae42df158ab67864 (diff) | |
| download | nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar.gz nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar.bz2 nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar.lz nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar.xz nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.tar.zst nixlib-628a8f48a8f20e2ea4a30e6936a723bc77ab3d67.zip | |
saga: migrate to by-name
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/sa/saga/package.nix (renamed from pkgs/applications/gis/saga/default.nix) | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/by-name/sa/saga/package.nix index 4c54aff3c3c9..3e9497b699da 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bab08f433b80..be32a883e584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |