From a94dd454e915e7c6308ebd51788d43468c079c25 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Fri, 28 Feb 2025 19:44:22 -0600
Subject: [PATCH 1/2] convmv: add dependencies to support additional encodings

This adds support for the following encodings:

```diff
diff --git a/a b/b
--- a/a
+++ b/b
@@ -4,8 +4,21 @@ AdobeSymbol
 AdobeZdingbat
 ascii
 ascii-ctrl
+big5-1984
+big5-2003
 big5-eten
 big5-hkscs
+big5ext
+big5plus
+cccii
+cns11643-1
+cns11643-2
+cns11643-3
+cns11643-4
+cns11643-5
+cns11643-6
+cns11643-7
+cns11643-f
 cp1006
 cp1026
 cp1047
@@ -46,15 +59,20 @@ cp949
 cp950
 dingbats
 euc-cn
+euc-jisx0213
 euc-jp
 euc-kr
+euc-tw
 gb12345-raw
+gb18030
 gb2312-raw
 gsm0338
 hp-roman8
 hz
+IMAP-UTF-7
 iso-2022-jp
 iso-2022-jp-1
+iso-2022-jp-3
 iso-2022-kr
 iso-8859-1
 iso-8859-10
@@ -75,6 +93,8 @@ iso-ir-165
 jis0201-raw
 jis0208-raw
 jis0212-raw
+jis0213-1-raw
+jis0213-2-raw
 johab
 koi8-f
 koi8-r
@@ -109,9 +129,11 @@ nextstep
 null
 posix-bc
 shiftjis
+shiftjisx0213
 symbol
 UCS-2BE
 UCS-2LE
+unisys
 UTF-16
 UTF-16BE
 UTF-16LE
```
---
 pkgs/by-name/co/convmv/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix
index 9670d85dcd64..9b13a336a56c 100644
--- a/pkgs/by-name/co/convmv/package.nix
+++ b/pkgs/by-name/co/convmv/package.nix
@@ -2,7 +2,9 @@
   lib,
   stdenv,
   fetchzip,
+  makeWrapper,
   perl,
+  perlPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,9 +23,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [
+    makeWrapper
+    perl
+  ];
 
-  buildInputs = [ perl ];
+  buildInputs = [
+    perl
+    perlPackages.EncodeHanExtra
+    perlPackages.EncodeIMAPUTF7
+    perlPackages.EncodeJIS2K
+  ];
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
@@ -46,6 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontPatchShebangs = true;
 
+  postFixup = ''
+    wrapProgram "$out/bin/convmv" --prefix PERL5LIB : "$PERL5LIB"
+  '';
+
   meta = with lib; {
     description = "Converts filenames from one encoding to another";
     downloadPage = "https://www.j3e.de/linux/convmv/";

From 07587e8c9d75e47ac9dfa83663fded4bb61c068c Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Sun, 16 Mar 2025 14:07:54 -0500
Subject: [PATCH 2/2] convmv: add split `bin` output

---
 pkgs/by-name/co/convmv/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix
index 9b13a336a56c..50036f87495f 100644
--- a/pkgs/by-name/co/convmv/package.nix
+++ b/pkgs/by-name/co/convmv/package.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.06";
 
   outputs = [
-    "out"
+    "bin"
     "man"
+    "out"
   ];
 
   src = fetchzip {
@@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   makeFlags = [
-    "PREFIX=${placeholder "out"}"
+    "PREFIX=${placeholder "bin"}"
     "MANDIR=${placeholder "man"}/share/man"
   ];
 
@@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontPatchShebangs = true;
 
   postFixup = ''
-    wrapProgram "$out/bin/convmv" --prefix PERL5LIB : "$PERL5LIB"
+    wrapProgram "$bin/bin/convmv" --prefix PERL5LIB : "$PERL5LIB"
   '';
 
   meta = with lib; {