diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/by-name/sp/spatialite-gui/package.nix similarity index 72% rename from pkgs/applications/gis/spatialite-gui/default.nix rename to pkgs/by-name/sp/spatialite-gui/package.nix index c5257c9669a1..3db1671858c1 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -23,9 +23,6 @@ wxGTK, xz, zstd, - Carbon, - Cocoa, - IOKit, }: stdenv.mkDerivation rec { @@ -41,33 +38,27 @@ stdenv.mkDerivation rec { pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; - buildInputs = - [ - curl - freexl - geos - librasterlite2 - librttopo - libspatialite - libwebp - libxlsxwriter - libxml2 - lz4 - minizip - openjpeg - postgresql - proj - sqlite - virtualpg - wxGTK - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - IOKit - ]; + buildInputs = [ + curl + freexl + geos + librasterlite2 + librttopo + libspatialite + libwebp + libxlsxwriter + libxml2 + lz4 + minizip + openjpeg + postgresql + proj + sqlite + virtualpg + wxGTK + xz + zstd + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 69c43cafe524..327279cfcbf4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1228,6 +1228,7 @@ mapAliases { SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 spark2014 = gnatprove; # Added 2024-02-25 + spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 # Added 2020-02-10 sourceHanSansPackages = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465bee933ba7..87c0a8890a47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12864,8 +12864,7 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - spatialite_gui = callPackage ../applications/gis/spatialite-gui { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; + spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix { wxGTK = wxGTK32; };