From abe6e670d356b8333b41c7359c0ab25a58fe736b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Mar 2019 01:34:18 +0100 Subject: gnu: sane-backends-minimal: Fix USB support. * gnu/packages/scanner.scm (sane-backends-minimal)[inputs]: Replace libusb-compat with libusb. [arguments]: Disable tests that require USB access. --- gnu/packages/scanner.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'gnu/packages/scanner.scm') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index d030d8ade5..462727bc59 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -55,7 +55,7 @@ (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libusb-compat" ,libusb-compat))) + `(("libusb" ,libusb))) (arguments `(#:phases (modify-phases %standard-phases @@ -63,19 +63,27 @@ (lambda _ (setenv "BACKENDS" " ") #t)) - ;; Disable unmaintained tests that that fail with errors resembling: - ;; - ;; < # by sane-desc 3.5 from sane-backends 1.0.24git on Jul 31 2013 - ;; --- - ;; > # by sane-desc 3.5 from sane-backends 1.0.27 on 1970-01-01# - ;; FAIL: sane-desc -m usermap -s ./data - (add-before 'configure 'disable-failing-tests + (add-after 'unpack 'disable-failing-tests (lambda _ + ;; Disable unmaintained tests that that fail with errors resembling: + ;; + ;; < # by sane-desc 3.5 from sane-backends 1.0.24git on Jul 31 2013 + ;; --- + ;; > # by sane-desc 3.5 from sane-backends 1.0.27 on 1970-01-01# + ;; FAIL: sane-desc -m usermap -s ./data (for-each (lambda (pattern) (substitute* "testsuite/tools/Makefile.in" (((string-append " " pattern " ")) " "))) (list "usermap" "db" "udev" "udev\\+acl" "udev\\+hwdb" "hwdb")) + + ;; Disable tests that try to connect to actual USB hardware & fail + ;; with the following error when no USB access is allowed at all: + ;; + ;; sanei_usb_test: sanei_usb_test.c:849: main: Assertion + ;; `test_init (1)' failed. + (substitute* "testsuite/sanei/Makefile.in" + (("sanei_usb_test\\$\\(EXEEXT\\) ") "")) #t)) (add-after 'install 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) -- cgit 1.4.1 From 10bd2889d267df479f79f43471d3c2dd17da345a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 Mar 2019 15:54:14 +0100 Subject: gnu: sane-backends: Support PNG scanimage output. * gnu/packages/scanner.scm (sane-backends)[inputs]: Add libpng. --- gnu/packages/scanner.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/scanner.scm') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 462727bc59..75f5525d3d 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -112,6 +112,7 @@ package contains the library, but no drivers.") (name "sane-backends") (inputs `(("hplip" ,(@ (gnu packages cups) hplip-minimal)) + ("libpng" ,libpng) ; support ‘scanimage --format=png’ ,@(package-inputs sane-backends-minimal))) (arguments (substitute-keyword-arguments (package-arguments sane-backends-minimal) -- cgit 1.4.1 From 6845ab5204b1b6b89282ea315d32a2f007578116 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Mar 2019 17:11:55 +0100 Subject: gnu: Import (gnu packages image) in (gnu packages scanner). This is a follow-up to commit 10bd2889d267df479f79f43471d3c2dd17da345a. * gnu/packages/scanner.scm: #:use-module (gnu packages image). --- gnu/packages/scanner.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/scanner.scm') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 75f5525d3d..6539756a6e 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -26,6 +26,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module ((guix licenses) #:prefix licence:)) -- cgit 1.4.1