diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-12 20:52:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 20:52:50 +0200 |
| commit | 651b29818c08a96ab28a8521044e1d986448073a (patch) | |
| tree | 76f212a3ce08a03f3a18296b3368f70bedcbf6af | |
| parent | ed388cd656d706f3c0f0f85a3217ce78b1c42184 (diff) | |
| parent | 8f31bb2012e6bd90cfe089440e454badb661e085 (diff) | |
Merge pull request #195007 from wegank/spatialite-gui-wxgtk
| -rw-r--r-- | pkgs/applications/gis/spatialite-gui/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 3fc5b08beb171..76014887d2b8a 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48614a88ae02..b0bca68bbf00c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |