epson-escpr: 1.7.20 -> 1.8.6

Also fixed gcc14 build issues Got patches from Gentoo repo
NixOS · Jan 3, 2025 · c98e791 · c98e791
1 parent 070ae1c
commit c98e791
Showing 1 changed file with 47 additions and 7 deletions.
diff --git a/pkgs/by-name/ep/epson-escpr/package.nix b/pkgs/by-name/ep/epson-escpr/package.nix
@@ -1,7 +1,18 @@
-{ lib, stdenv, fetchurl, cups }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cups,
+  fetchpatch,
+  dos2unix,
+  automake115x,
+  autoconf,
+}:
 
-let version = "1.7.20";
-in stdenv.mkDerivation {
+let
+  version = "1.8.6-1";
+in
+stdenv.mkDerivation {
   pname = "epson-escpr";
   inherit version;
 
@@ -12,16 +23,45 @@ in stdenv.mkDerivation {
     # version.
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
-      "https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz"
+      "https://download3.ebz.epson.net/dsc/f/03/00/16/21/81/74d098a47c3a616713079c9cd5904b468bb33dea/epson-inkjet-printer-escpr-${version}.tar.gz"
 
-      "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz"
+      "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/16/21/81/74d098a47c3a616713079c9cd5904b468bb33dea/epson-inkjet-printer-escpr-${version}.tar.gz"
     ];
-    sha256 = "sha256:09rscpm557dgaflylr93wcwmyn6fnvr8nc77abwnq97r6hxwrkhk";
+    sha256 = "sha256-hVbX4OXPe4y37Szju3uVdXlVdjX4DFSN/A2Emz3eCcQ=";
   };
+  postUnpack = ''
+        cd "epson-inkjet-printer-escpr-1.8.6";
+    	local f
+    	for f in $(find ./ -type f || die); do
+    		${dos2unix}/bin/dos2unix $f
+    	done
+      cd ..
+  '';
 
-  patches = [ ./cups-filter-ppd-dirs.patch ];
+  patches = [
+    ./cups-filter-ppd-dirs.patch
+    # DOS Line Endings in /lib directory and UNIX Line endings in /src directory.
+    # So a separate patch for /lib and /src
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch";
+      hash = "sha256-L4WhaxPQnJYyqCH00wiKIlFNMmCEXoGe5d7hJ5TMyEI=";
+    })
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/epson-inkjet-printer-escpr/files/1.8.6-warnings.patch";
+      hash = "sha256-wSY0LZv2b+1kF7TfPolt554g79y2Ce6N/JqgjJyd3Ag=";
+    })
+  ];
 
+  # To suppress error (Stripping trailing CRs from patch; use --binary to disable.)
+  patchFlags = [
+    "--binary"
+    "-p1"
+  ];
   buildInputs = [ cups ];
+  nativeBuildInputs = [
+    automake115x
+    autoconf
+  ];
 
   meta = with lib; {
     homepage = "http://download.ebz.epson.net/dsc/search/01/search/";