unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Andy Patterson <ajpatter@uwaterloo.ca>
To: 25101@debbugs.gnu.org
Subject: bug#25101: [PATCH 1/2] gnu: Add hpaio-enabled sane-backends variant.
Date: Sat,  3 Dec 2016 23:00:36 -0500	[thread overview]
Message-ID: <20161204040037.21758-2-ajpatter@uwaterloo.ca> (raw)
In-Reply-To: <20161204040037.21758-1-ajpatter@uwaterloo.ca>

* 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 <jmd@gnu.org>
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; 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

  reply	other threads:[~2016-12-04  4:02 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-03 18:41 bug#25101: simple-scan can't use hpaio Danny Milosavljevic
2016-12-04  4:00 ` Andy Patterson
2016-12-04  4:00   ` Andy Patterson [this message]
2016-12-05 20:48     ` bug#25101: [PATCH 1/2] gnu: Add hpaio-enabled sane-backends variant Ludovic Courtès
2016-12-05 22:38       ` Andy Patterson
2016-12-06  9:10         ` Ludovic Courtès
2016-12-12 20:11           ` Andy Patterson
2016-12-12 22:41             ` Ludovic Courtès
2016-12-14  5:03               ` Andy Patterson
2016-12-14  5:03                 ` bug#25101: [PATCH 1/3] gnu: sane-backends: Disable backend generation Andy Patterson
2016-12-14  5:03                 ` bug#25101: [PATCH 2/3] gnu: Add and use sane-backends-minimal Andy Patterson
2016-12-14  5:03                 ` bug#25101: [PATCH 3/3] gnu: Add and use sane-backends Andy Patterson
2016-12-17 22:12                 ` bug#25101: [PATCH 1/2] gnu: Add hpaio-enabled sane-backends variant Ludovic Courtès
2016-12-04  4:00   ` bug#25101: [PATCH 2/2] gnu: simple-scan: Enable hpaio support Andy Patterson
2016-12-04  4:18   ` bug#25101: simple-scan can't use hpaio Andy Patterson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161204040037.21758-2-ajpatter@uwaterloo.ca \
    --to=ajpatter@uwaterloo.ca \
    --cc=25101@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).