Commit 22bb14bd authored by Guillaume Girol's avatar Guillaume Girol
Browse files

sane-backends: generate hwdb entries for epkowa scanners correctly 

without patching.

Entries for these scanners are both in the doc/descriptions folder,
marked as unsupported by the epson2 backend, and in the doc/descriptions-external,
supported by the epkowa backend.
parent 73de017e

pkgs/applications/graphics/sane/backends/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ stdenv.mkDerivation { 
      url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch";

      sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI=";

    })

    # generate hwdb entries for scanners handled by other backends like epkowa

    # https://gitlab.com/sane-project/backends/-/issues/619

    ./sane-desc-generate-entries-unsupported-scanners.patch

  ];



  postPatch = ''
@@ -110,7 +107,7 @@ stdenv.mkDerivation { 
  in ''

    mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d

    ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules

    ./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb

    ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb

    # the created 49-libsane references /bin/sh

    substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \

      --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"

pkgs/applications/graphics/sane/backends/sane-desc-generate-entries-unsupported-scanners.patch

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
sane-desc does not include unsupported .desc entries like EPSON V300 PHOTO,

which can be supported by the (unfree) epkowa driver.

But we need those entries so that unprivileged users which have installed epkowa

can use the scanner.

diff --git a/tools/sane-desc.c b/tools/sane-desc.c

index 7a8645dea..9c9719fef 100644

--- a/tools/sane-desc.c

+++ b/tools/sane-desc.c

@@ -3243,10 +3243,6 @@ create_usbids_table (void)

 

 	      for (model = mfg->model; model; model = model->next)

 		{

-		  if ((model->status == status_unsupported)

-		      || (model->status == status_unknown))

-		    continue;

-

 		  if (model->usb_vendor_id && model->usb_product_id)

 		    {

 		      first_usbid = add_usbid (first_usbid, mfg->name,