diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-11 14:28:20 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-11 14:28:20 +0200 |
| commit | 8f31bb2012e6bd90cfe089440e454badb661e085 (patch) | |
| tree | 3c6b5da24610d1c8dcf1421d881b0d2948a38dc2 | |
| parent | d5af38887fbf4652dd4992a4f9b58f774398cdef (diff) | |
spatialite_gui: migrate to wxGTK32
| -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 2fa7db54f2101..f7e32689ff36f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26751,7 +26751,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 { }; |