From 15c084508e6b2b2dae714b4b4a09f09bd89ccdb7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 09:50:26 +0100
Subject: [PATCH 1/2] comical: move to pkgs/by-name

---
 .../default.nix => by-name/co/comical/package.nix}  | 13 ++++---------
 .../graphics => by-name/co}/comical/wxgtk-3.2.patch |  0
 pkgs/top-level/all-packages.nix                     |  4 ----
 3 files changed, 4 insertions(+), 13 deletions(-)
 rename pkgs/{applications/graphics/comical/default.nix => by-name/co/comical/package.nix} (86%)
 rename pkgs/{applications/graphics => by-name/co}/comical/wxgtk-3.2.patch (100%)

diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/by-name/co/comical/package.nix
similarity index 86%
rename from pkgs/applications/graphics/comical/default.nix
rename to pkgs/by-name/co/comical/package.nix
index 4fcbd1e98eeb..c008f2ce20bb 100644
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/pkgs/by-name/co/comical/package.nix
@@ -5,7 +5,6 @@
   hexdump,
   wxGTK32,
   zlib,
-  Cocoa,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,14 +24,10 @@ stdenv.mkDerivation rec {
     hexdump
   ];
 
-  buildInputs =
-    [
-      wxGTK32
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Cocoa
-    ];
+  buildInputs = [
+    wxGTK32
+    zlib
+  ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
diff --git a/pkgs/applications/graphics/comical/wxgtk-3.2.patch b/pkgs/by-name/co/comical/wxgtk-3.2.patch
similarity index 100%
rename from pkgs/applications/graphics/comical/wxgtk-3.2.patch
rename to pkgs/by-name/co/comical/wxgtk-3.2.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..e8c8b6405561 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13339,10 +13339,6 @@ with pkgs;
   cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; };
   cudatext = cudatext-qt;
 
-  comical = callPackage ../applications/graphics/comical {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
-
   cqrlog = callPackage ../applications/radio/cqrlog {
     hamlib = hamlib_4;
   };

From 09095ba1145838518ea6d0d7e667b490b5129395 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 09:51:50 +0100
Subject: [PATCH 2/2] comical: fix build

---
 pkgs/by-name/co/comical/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix
index c008f2ce20bb..5443b5231cfc 100644
--- a/pkgs/by-name/co/comical/package.nix
+++ b/pkgs/by-name/co/comical/package.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     "CXX=${stdenv.cc.targetPrefix}c++"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   preInstall = ''
     mkdir -p $out/bin
   '';