From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Patterson Subject: bug#25101: [PATCH 3/3] gnu: Add and use sane-backends. Date: Wed, 14 Dec 2016 00:03:25 -0500 Message-ID: <20161214050325.6348-4-ajpatter@uwaterloo.ca> References: <87zik0wz24.fsf@gnu.org> <20161214050325.6348-1-ajpatter@uwaterloo.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cH1kZ-0007ZF-5U for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cH1kV-0000Bp-7Q for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cH1kV-0000Bl-4g for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cH1kU-0004ZG-TY for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20161214050325.6348-1-ajpatter@uwaterloo.ca> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 25101@debbugs.gnu.org * gnu/packages/scanner.scm (sane-backends): New variable. * gnu/packages/gnome.scm (colord, simple-scan): Use it instead of 'sane-backends-minimal'. * gnu/packages/libreoffice.scm (libreoffice): Likewise. * gnu/packages/wine.scm (wine): Likewise. --- gnu/packages/gnome.scm | 4 ++-- gnu/packages/libreoffice.scm | 2 +- gnu/packages/scanner.scm | 40 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/wine.scm | 2 +- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ffe0bc2d..1762381cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2433,7 +2433,7 @@ keyboard shortcuts.") ("libusb" ,libusb) ("sqlite" ,sqlite) ("polkit" ,polkit) - ("sane-backends" ,sane-backends-minimal))) + ("sane-backends" ,sane-backends))) (home-page "http://www.freedesktop.org/software/colord/") (synopsis "Color management service") (description "Colord is a system service that makes it easy to manage, @@ -3571,7 +3571,7 @@ USB transfers with your high-level application or system daemon.") ("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) ("gusb" ,gusb) - ("libsane" ,sane-backends-minimal))) + ("libsane" ,sane-backends))) (native-inputs `(("gettext" ,gettext-minimal) ("itstool" ,itstool) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 307a54496..279e8e2d2 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -784,7 +784,7 @@ and to return information on pronunciations, meanings and synonyms.") ("postgresql" ,postgresql) ("python" ,python) ("redland" ,redland) - ("sane-backends" ,sane-backends-minimal) + ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) ("unzip" ,unzip) ("vigra" ,vigra) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index e913858f5..fdad1c445 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo +;;; Copyright © 2016 Andy Patterson ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages scanner) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages pkg-config) #:use-module (gnu packages libusb) @@ -78,3 +80,41 @@ proving access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The package contains the library, but no drivers.") (license licence:gpl2+))) ; plus linking exception + +;; This variant links in the hpaio backend, provided by hplip, which adds +;; support for HP scanners whose backends are not maintained by +;; 'sane-backends'. It also builds all of those backends. +(define-public sane-backends + (package + (inherit sane-backends-minimal) + (name "sane-backends") + (inputs + `(("hplip" ,(@ (gnu packages cups) hplip)) + ,@(package-inputs sane-backends-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments sane-backends-minimal) + ((#:phases phases) + `(modify-phases ,phases + (delete 'disable-backends) + (add-after 'unpack 'add-backends + (lambda _ + (substitute* "backend/dll.conf.in" + (("hp5590" all) (format #f "~a~%~a" all "hpaio"))) + #t)) + (add-after 'install 'install-hpaio + (lambda* (#:key inputs outputs #:allow-other-keys) + (define hplip (string-append (assoc-ref inputs "hplip") + "/lib/sane")) + (define out (string-append (assoc-ref outputs "out") + "/lib/sane")) + (for-each + (lambda (file) + (symlink file (string-append out "/" (basename file)))) + (find-files hplip)) + #t)))))) + (synopsis + "Raster image scanner library and drivers, with scanner support") + (description "SANE stands for \"Scanner Access Now Easy\" and is an API +proving access to any raster image scanner hardware (flatbed scanner, +hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The +package contains the library and drivers."))) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 83b6297f0..367f27af5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -83,7 +83,7 @@ ("libmpg123" ,mpg123) ("libldap" ,openldap) ("libnetapi" ,samba) - ("libsane" ,sane-backends-minimal) + ("libsane" ,sane-backends) ("libpng" ,libpng) ("libjpeg" ,libjpeg) ("libtiff" ,libtiff) -- 2.11.0