From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Patterson Subject: bug#25101: [PATCH 1/2] gnu: Add hpaio-enabled sane-backends variant. Date: Sat, 3 Dec 2016 23:00:36 -0500 Message-ID: <20161204040037.21758-2-ajpatter@uwaterloo.ca> References: <20161203194113.6456663e@scratchpost.org> <20161204040037.21758-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]:53796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDO05-0003wH-FM for bug-guix@gnu.org; Sat, 03 Dec 2016 23:02:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDO02-0005OP-TB for bug-guix@gnu.org; Sat, 03 Dec 2016 23:02:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cDO02-0005OI-PT for bug-guix@gnu.org; Sat, 03 Dec 2016 23:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cDO02-0007ib-HB for bug-guix@gnu.org; Sat, 03 Dec 2016 23:02:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20161204040037.21758-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: 25101@debbugs.gnu.org * gnu/packages/scanner.scm (sane-backends+hpaio): New variable. --- gnu/packages/scanner.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 76817b3..f918291 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) @@ -73,3 +75,31 @@ 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.") (license licence:gpl2+))) ; plus linking exception + +(define-public sane-backends+hpaio + (package + (inherit sane-backends) + (name "sane-backends+hpaio") + (inputs + `(("hplip" ,(@ (gnu packages cups) hplip)) + ,@(package-inputs sane-backends))) + (arguments + (substitute-keyword-arguments (package-arguments sane-backends) + ((#:phases phases) + `(modify-phases ,phases + (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)))))))) -- 2.10.2