Unverified Commit 9bdcdf3d authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

Merge pull request #199550 from symphorien/sane-epkowa 

sane_backends: more complete hwdb files
parents 0162a6c2 b4cbe1da

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 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 = ''

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

0 → 100644
+19 −0
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,