amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sane-backends: Remove hplip dependency.

Browse source 
* gnu/packages/scanner.scm (sane-backends)[inputs]: Omit hplip.
[arguments]: Remove hplip phases.
* gnu/services/desktop.scm (lift-sane-configuration): Warn user that
hplip needs to be explicitly enabled in sane-configuration.

Change-Id: I05ffc3a2d04c5ee3da2739b68085557ff791814f
This commit is contained in:
Sergey Trofimov 2025-06-12 14:17:54 +02:00 • committed by Andreas Enge
parent d0afa6ed01
commit 2d24be9431
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/scanner.scm
View file

@ -224,15 +224,11 @@ hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The
package contains the library, but no drivers.") package contains the library, but no drivers.")
(license license:gpl2+))) ; plus linking exception (license license: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 the SANE
;; project, and builds all of those backends.
(define-public sane-backends (define-public sane-backends
(package/inherit sane (package/inherit sane
(name "sane-backends") (name "sane-backends")
(inputs (inputs
`(("hplip" ,(@ (gnu packages cups) hplip)) `(("libjpeg" ,libjpeg-turbo) ; for pixma/epsonds/other back ends
("libjpeg" ,libjpeg-turbo) ; for pixma/epsonds/other back ends
("libpng" ,libpng) ; support ‘scanimage --format=png’ ("libpng" ,libpng) ; support ‘scanimage --format=png’
("libxml2" ,libxml2) ; for pixma back end ("libxml2" ,libxml2) ; for pixma back end
,@(package-inputs sane))) ,@(package-inputs sane)))
@ -247,22 +243,6 @@ package contains the library, but no drivers.")
;; <https://bugs.gnu.org/39449> ;; <https://bugs.gnu.org/39449>
(substitute* "testsuite/backend/genesys/Makefile.in" (substitute* "testsuite/backend/genesys/Makefile.in"
((" genesys_unit_tests\\$\\(EXEEXT\\)") "")) ((" genesys_unit_tests\\$\\(EXEEXT\\)") ""))
#t))
(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)))))) #t))))))
(synopsis (synopsis
"Raster image scanner library and drivers, with scanner support") "Raster image scanner library and drivers, with scanner support")

7
gnu/services/desktop.scm
View file

@ -1712,7 +1712,12 @@ accountsservice web site} for more information."
config config
(begin (begin
(when warn? (when warn?
(warning (G_ "'sane' service now expects a 'sane-configuration' record~%"))) (warning (G_ "'sane' service now expects a 'sane-configuration' record~%"))
(when (eq? config sane-backends)
(warning (G_ "'sane-backends' does not include 'hplip' backend anymore. Add it
explicitly when needed.~%"))))
(sane-configuration (backends (list config)))))) (sane-configuration (backends (list config))))))
(define sane-service-type (define sane-service-type