diff --git a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch deleted file mode 100644 index 02897f4f44d9..000000000000 --- a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/configure.orig b/configure -index e9d400f..dac1943 100755 ---- a/configure.orig -+++ b/configure -@@ -12184,48 +12184,8 @@ esac - # *) ESCPR_LIB_NAME="escpr2_32" ;; - #esac - -- -- --# Check whether --with-cupsfilterdir was given. --if test "${with_cupsfilterdir+set}" = set; then : -- withval=$with_cupsfilterdir; --else -- with_cupsfilterdir=no --fi -- --if test "xno" = "x${with_cupsfilterdir}"; then -- if test "xyes" = "x$have_cups_config" ; then -- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter" -- else -- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" -- fi --else -- CUPS_FILTER_DIR="${with_cupsfilterdir}" --fi -- -- --# Check whether --with-cupsppddir was given. --if test "${with_cupsppddir+set}" = set; then : -- withval=$with_cupsppddir; --else -- with_cupsppddir=no --fi -- --if test "xno" = "x${with_cupsppddir}"; then -- if test -d "${cups_default_prefix}/share/ppd" ; then -- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" -- elif test "xyes" = "x$have_cups_config" ; then -- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" -- else -- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" -- fi --else -- CUPS_PPD_DIR="${with_cupsppddir}" --fi -- -- -- -- -+CUPS_FILTER_DIR="${prefix}/lib/cups/filter" -+CUPS_PPD_DIR="${prefix}/share/cups/model" - - # Check whether --enable-lsb was given. - if test "${enable_lsb+set}" = set; then : diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 2037b311639b..d15c5d7cfc37 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + autoreconfHook, cups, rpm, cpio, @@ -9,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/98/70/f6a682eeeba1fd8bdf2ac112d5e1111d951c64a6/epson-inkjet-printer-escpr2-1.2.12-1.src.rpm"; - sha256 = "sha256-7OkDlYhfQ/S3OD5QeN7DgNK0+LHabIm8zErtUDYcqwo="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/00/23/60c57d2774eea9b27d2c636f0c3615b8619291b3/epson-inkjet-printer-escpr2-1.2.13-1.src.rpm"; + sha256 = "sha256-yOZqeNrtC28OucY5HOT6OY6qqvLSGh1LTIXbIB7VNrY="; }; unpackPhase = '' @@ -29,14 +30,18 @@ stdenv.mkDerivation rec { runHook postUnpack ''; - patches = [ ./cups-filter-ppd-dirs.patch ]; - buildInputs = [ cups ]; nativeBuildInputs = [ + autoreconfHook rpm cpio ]; + configureFlags = [ + "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter" + "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model" + ]; + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R 2 Driver (generic driver)";