From 0d0a2ad4d7b14229bf067f8d6d97f1e2bdd9dff9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:38:23 +0100
Subject: [PATCH 1/4] xmlcopyeditor: move to pkgs/by-name

---
 .../default.nix => by-name/xm/xmlcopyeditor/package.nix}      | 3 ---
 .../editors => by-name/xm}/xmlcopyeditor/xmlcopyeditor.patch  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 7 deletions(-)
 rename pkgs/{applications/editors/xmlcopyeditor/default.nix => by-name/xm/xmlcopyeditor/package.nix} (94%)
 rename pkgs/{applications/editors => by-name/xm}/xmlcopyeditor/xmlcopyeditor.patch (100%)

diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix
similarity index 94%
rename from pkgs/applications/editors/xmlcopyeditor/default.nix
rename to pkgs/by-name/xm/xmlcopyeditor/package.nix
index 0c58d35042ae..413efe921d08 100644
--- a/pkgs/applications/editors/xmlcopyeditor/default.nix
+++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix
@@ -11,7 +11,6 @@
 , pcre2
 , wxGTK32
 , xercesc
-, Cocoa
 }:
 
 stdenv.mkDerivation rec {
@@ -46,8 +45,6 @@ stdenv.mkDerivation rec {
     pcre2
     wxGTK32
     xercesc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch b/pkgs/by-name/xm/xmlcopyeditor/xmlcopyeditor.patch
similarity index 100%
rename from pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch
rename to pkgs/by-name/xm/xmlcopyeditor/xmlcopyeditor.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..cb6d050c45d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16680,10 +16680,6 @@ with pkgs;
     stdenv = gcc9Stdenv;
   };
 
-  xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
-
   xmp = callPackage ../applications/audio/xmp {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
   };

From 106603e4e924bdaaadeb67567dd8484ec17751c8 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 12 Nov 2024 00:14:00 +0100
Subject: [PATCH 2/4] xmlcopyeditor: reformat

---
 pkgs/by-name/xm/xmlcopyeditor/package.nix | 32 +++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix
index 413efe921d08..1bfae3fb9c0e 100644
--- a/pkgs/by-name/xm/xmlcopyeditor/package.nix
+++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchurl
-, aspell
-, boost
-, expat
-, intltool
-, pkg-config
-, libxml2
-, libxslt
-, pcre2
-, wxGTK32
-, xercesc
+{
+  lib,
+  stdenv,
+  fetchurl,
+  aspell,
+  boost,
+  expat,
+  intltool,
+  pkg-config,
+  libxml2,
+  libxslt,
+  pcre2,
+  wxGTK32,
+  xercesc,
 }:
 
 stdenv.mkDerivation rec {
@@ -54,7 +55,10 @@ stdenv.mkDerivation rec {
     homepage = "https://xml-copy-editor.sourceforge.io/";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ candeira wegank ];
+    maintainers = with maintainers; [
+      candeira
+      wegank
+    ];
     mainProgram = "xmlcopyeditor";
   };
 }

From 0994c14cca3f2336f518d2d5460c9bb4621cdd1f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 12 Nov 2024 00:15:02 +0100
Subject: [PATCH 3/4] xmlcopyeditor: refactor

---
 pkgs/by-name/xm/xmlcopyeditor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix
index 1bfae3fb9c0e..ee5e1562e9b4 100644
--- a/pkgs/by-name/xm/xmlcopyeditor/package.nix
+++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix
@@ -14,13 +14,13 @@
   xercesc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xmlcopyeditor";
   version = "1.3.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
-    sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";
+    url = "mirror://sourceforge/xml-copy-editor/xmlcopyeditor-${finalAttrs.version}.tar.gz";
+    hash = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";
   };
 
   patches = [ ./xmlcopyeditor.patch ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   #        with an rvalue of type 'const xmlError *' (aka 'const _xmlError *')
   postPatch = ''
     substituteInPlace src/wraplibxml.cpp \
-      --replace "xmlErrorPtr err" "const xmlError *err"
+      --replace-fail "xmlErrorPtr err" "const xmlError *err"
   '';
 
   nativeBuildInputs = [
@@ -50,15 +50,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Fast, free, validating XML editor";
     homepage = "https://xml-copy-editor.sourceforge.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       candeira
       wegank
     ];
     mainProgram = "xmlcopyeditor";
   };
-}
+})

From d9eab9528a96be0f2d82d36eb97538b819e596ff Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 12 Nov 2024 00:15:30 +0100
Subject: [PATCH 4/4] xmlcopyeditor: fix darwin build

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

diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix
index ee5e1562e9b4..6e614460b8b6 100644
--- a/pkgs/by-name/xm/xmlcopyeditor/package.nix
+++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     xercesc
   ];
 
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
   enableParallelBuilding = true;
 
   meta = {