TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: hplip: Re-order fields.

Browse source 
* gnu/packages/cups.scm (hplip): Re-order fields.
This commit is contained in:
Maxim Cournoyer 2023-02-17 22:46:41 -05:00
parent 2a97bf3c50
commit da923bc122
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/cups.scm
View file

@ -539,21 +539,15 @@ (define-public hplip
"dat2drvdir = $(pkglibexecdir)\n") "dat2drvdir = $(pkglibexecdir)\n")
(("^locatedriverdir =.*") (("^locatedriverdir =.*")
"locatedriverdir = $(pkglibexecdir)\n")))))) "locatedriverdir = $(pkglibexecdir)\n"))))))
(build-system gnu-build-system)
(outputs (list "out" "ppd")) (outputs (list "out" "ppd"))
(home-page "https://developers.hp.com/hp-linux-imaging-and-printing") (build-system gnu-build-system)
(synopsis "HP printer drivers")
(description
"Hewlett-Packard printer drivers and PostScript Printer Descriptions
(@dfn{PPD}s).")
;; The 'COPYING' file lists directories where each of these 3 licenses
;; applies.
(license (list license:gpl2+ license:bsd-3 license:expat))
;; TODO install apparmor profile files eventually.
(arguments (arguments
`(#:configure-flags `(#:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules)
#:modules ((guix build gnu-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))
#:configure-flags
`("--disable-imageProcessor-build" `("--disable-imageProcessor-build"
"--disable-network-build" "--disable-network-build"
,(string-append "--prefix=" (assoc-ref %outputs "out")) ,(string-append "--prefix=" (assoc-ref %outputs "out"))
@ -576,13 +570,6 @@ (define-public hplip
,(string-append "--with-systraydir=" ,(string-append "--with-systraydir="
(assoc-ref %outputs "out") "/etc/xdg") (assoc-ref %outputs "out") "/etc/xdg")
"--enable-qt5" "--disable-qt4") "--enable-qt5" "--disable-qt4")
#:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules)
#:modules ((guix build gnu-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-hard-coded-file-names (add-after 'unpack 'fix-hard-coded-file-names
@ -676,12 +663,12 @@ (define-public hplip
(chmod file #o755))) (chmod file #o755)))
(find-files "." (lambda (file stat) (find-files "." (lambda (file stat)
(eq? 'symlink (stat:type stat)))))))))))) (eq? 'symlink (stat:type stat))))))))))))
;; Note that the error messages printed by the tools in the case of ;; Note that the error messages printed by the tools in the case of
;; missing dependencies are often downright misleading. ;; missing dependencies are often downright misleading.
;; TODO: hp-toolbox still fails to start with: ;; TODO: hp-toolbox still fails to start with:
;; from dbus.mainloop.pyqt5 import DBusQtMainLoop ;; from dbus.mainloop.pyqt5 import DBusQtMainLoop
;; ModuleNotFoundError: No module named 'dbus.mainloop.pyqt5' ;; ModuleNotFoundError: No module named 'dbus.mainloop.pyqt5'
(native-inputs (list perl pkg-config))
(inputs (inputs
`(("cups-minimal" ,cups-minimal) `(("cups-minimal" ,cups-minimal)
("dbus" ,dbus) ("dbus" ,dbus)
@ -694,8 +681,14 @@ (define-public hplip
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("sane-backends" ,sane-backends-minimal) ("sane-backends" ,sane-backends-minimal)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
(list perl pkg-config)))) (synopsis "HP printer drivers")
(description
"Hewlett-Packard printer drivers and PostScript Printer Descriptions
(@dfn{PPD}s).")
;; The 'COPYING' file lists directories where each of these 3 licenses
;; applies.
(license (list license:gpl2+ license:bsd-3 license:expat))))
(define-public hplip-minimal (define-public hplip-minimal
(package/inherit hplip (package/inherit hplip