From 88b06c19e852d66e1d43ebbc614a063330dc9085 Mon Sep 17 00:00:00 2001
From: DeimElias <deimelias@gmail.com>
Date: Thu, 16 Oct 2025 14:30:39 -0600
Subject: [PATCH 1/4] maintainers: add deimelias

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe767fc74b92..fb0121202399 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6156,6 +6156,12 @@
     github = "deifactor";
     githubId = 30192992;
   };
+  deimelias = {
+    name = "Deim Elias";
+    github = "DeimElias";
+    email = "deimelias@gmail.com";
+    githubId = 100871962;
+  };
   deinferno = {
     name = "deinferno";
     github = "deinferno";

From 857beb6d531e914028559ee1452740058ebc2b9c Mon Sep 17 00:00:00 2001
From: DeimElias <deimelias@gmail.com>
Date: Thu, 16 Oct 2025 14:34:47 -0600
Subject: [PATCH 2/4] cups-zj-58:"2018-02-22" -> "2019-02-28"

---
 pkgs/by-name/cu/cups-zj-58/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix
index a356f595383f..c2b92a7f6fc0 100644
--- a/pkgs/by-name/cu/cups-zj-58/package.nix
+++ b/pkgs/by-name/cu/cups-zj-58/package.nix
@@ -3,31 +3,42 @@
   stdenv,
   fetchFromGitHub,
   cups,
+  cmake,
+  pkg-config,
 }:
 
 stdenv.mkDerivation {
   pname = "cups-zj-58";
-  version = "2018-02-22";
+  version = "2019-04-28";
 
   src = fetchFromGitHub {
     owner = "klirichek";
     repo = "zj-58";
-    rev = "e4212cd702113a4bd4d7013744291c9f60bc5273";
-    sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
+    rev = "64743565df4379098b68a197d074c86617a8fc0a";
+    sha256 = "sha256-4l9NRfp0hiPDC6dtFsq7jLf0Gn9tktGy6oZ4GHxSfbw=";
   };
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [ cups ];
 
   installPhase = ''
+    install -D ppd/zj80.ppd $out/share/cups/model/zjiang/zj80.ppd
+    install -D ppd/zj58.ppd $out/share/cups/model/zjiang/zj58.ppd
     install -D rastertozj $out/lib/cups/filter/rastertozj
-    install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd
   '';
 
   meta = with lib; {
     description = "CUPS filter for thermal printer Zjiang ZJ-58";
     homepage = "https://github.com/klirichek/zj-58";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ makefu ];
+    maintainers = with maintainers; [
+      makefu
+      deimelias
+    ];
     license = licenses.bsd2;
   };
 }

From 78ec61a22db1518ac46486efea84c76bb4238d59 Mon Sep 17 00:00:00 2001
From: DeimElias <100871962+DeimElias@users.noreply.github.com>
Date: Fri, 17 Oct 2025 21:31:07 -0600
Subject: [PATCH 3/4] cups-zj-58: update version name and fix typo

Co-authored-by: Yohann Boniface <edhyjox@gmail.com>
---
 pkgs/by-name/cu/cups-zj-58/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix
index c2b92a7f6fc0..488a8faab6fe 100644
--- a/pkgs/by-name/cu/cups-zj-58/package.nix
+++ b/pkgs/by-name/cu/cups-zj-58/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "cups-zj-58";
-  version = "2019-04-28";
+  version = "0-unstable-2019-04-28";
 
   src = fetchFromGitHub {
     owner = "klirichek";
     repo = "zj-58";
     rev = "64743565df4379098b68a197d074c86617a8fc0a";
-    sha256 = "sha256-4l9NRfp0hiPDC6dtFsq7jLf0Gn9tktGy6oZ4GHxSfbw=";
+    hash = "sha256-4l9NRfp0hiPDC6dtFsq7jLf0Gn9tktGy6oZ4GHxSfbw=";
   };
 
   nativeBuildInputs = [

From a7d34dcaa91602ba9d663f7b90c27f4d68f4ed9d Mon Sep 17 00:00:00 2001
From: DeimElias <deimelias@gmail.com>
Date: Fri, 17 Oct 2025 22:59:02 -0600
Subject: [PATCH 4/4] cups-zj-58: fix CMake compatibility

---
 pkgs/by-name/cu/cups-zj-58/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix
index 488a8faab6fe..24ec666f92fd 100644
--- a/pkgs/by-name/cu/cups-zj-58/package.nix
+++ b/pkgs/by-name/cu/cups-zj-58/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ cups ];
 
+  patchPhase = ''
+    substituteInPlace CMakeLists.txt \
+    --replace-fail "cmake_minimum_required ( VERSION 3.0 )" "cmake_minimum_required ( VERSION 3.10 )"
+  '';
+
   installPhase = ''
     install -D ppd/zj80.ppd $out/share/cups/model/zjiang/zj80.ppd
     install -D ppd/zj58.ppd $out/share/cups/model/zjiang/zj58.ppd