BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #195007 from wegank/spatialite-gui-wxgtk

Browse source
This commit is contained in:
Sandro 2022-10-12 20:52:50 +02:00 committed by GitHub
commit 651b29818c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/gis/spatialite-gui/default.nix
View file

@ -20,7 +20,6 @@
, sqlite
, virtualpg
, wxGTK
, wxmac
, xz
, zstd
, Carbon
@ -57,10 +56,10 @@ stdenv.mkDerivation rec {
proj
sqlite
virtualpg
wxGTK
xz
zstd
] ++ lib.optional stdenv.isLinux wxGTK
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ];
enableParallelBuilding = true;

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

@ -26763,7 +26763,7 @@ with pkgs;
spatialite_gui = callPackage ../applications/gis/spatialite-gui {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
wxGTK = wxGTK30-gtk3;
wxGTK = wxGTK32;
};
spatialite_tools = callPackage ../applications/gis/spatialite-tools { };