From 4210a20cd04f76f22f6af916067369c91aa00d12 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 13 Jan 2025 12:53:07 +0100
Subject: [PATCH 1/3] spatialite_gui: rename package to spatialite-gui

Co-authored-by: Arne Keller <arne.keller@posteo.de>
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 770d6c409fab..15465e23280c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12877,7 +12877,7 @@ with pkgs;
 
   qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
 
-  spatialite_gui = callPackage ../applications/gis/spatialite-gui {
+  spatialite-gui = callPackage ../applications/gis/spatialite-gui {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
     wxGTK = wxGTK32;
   };

From 3264ea8b39e869c7202044a6d755552cdb7438d6 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 13 Jan 2025 12:57:25 +0100
Subject: [PATCH 2/3] spatialite-gui: move to pkgs/by-name

---
 .../default.nix => by-name/sp/spatialite-gui/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/gis/spatialite-gui/default.nix => by-name/sp/spatialite-gui/package.nix} (100%)

diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/by-name/sp/spatialite-gui/package.nix
similarity index 100%
rename from pkgs/applications/gis/spatialite-gui/default.nix
rename to pkgs/by-name/sp/spatialite-gui/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15465e23280c..b718d8ebe689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12877,7 +12877,7 @@ with pkgs;
 
   qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
 
-  spatialite-gui = callPackage ../applications/gis/spatialite-gui {
+  spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
     wxGTK = wxGTK32;
   };

From f1eaa3de819f15a242de3bcea6e5950b04e78c4f Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 14 Jan 2025 15:12:35 +0100
Subject: [PATCH 3/3] spatialite-gui: remove obsolete darwin tweaks

Co-authored-by: Arne Keller <arne.keller@posteo.de
---
 pkgs/by-name/sp/spatialite-gui/package.nix | 51 +++++++++-------------
 pkgs/top-level/all-packages.nix            |  1 -
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix
index c5257c9669a1..3db1671858c1 100644
--- a/pkgs/by-name/sp/spatialite-gui/package.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/all-packages.nix b/pkgs/top-level/all-packages.nix
index b718d8ebe689..895143115b51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12878,7 +12878,6 @@ with pkgs;
   qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
 
   spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
     wxGTK = wxGTK32;
   };