[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/25: gnu: hplip: Re-order fields.
From: |
guix-commits |
Subject: |
16/25: gnu: hplip: Re-order fields. |
Date: |
Sat, 15 Apr 2023 00:27:33 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit da923bc12232ee0aacacd3f69ae9db0682903dd9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Feb 17 22:46:41 2023 -0500
gnu: hplip: Re-order fields.
* gnu/packages/cups.scm (hplip): Re-order fields.
---
gnu/packages/cups.scm | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 27363ae977..f08c7c8584 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -539,21 +539,15 @@ should only be used as part of the Guix cups-pk-helper
service.")
"dat2drvdir = $(pkglibexecdir)\n")
(("^locatedriverdir =.*")
"locatedriverdir = $(pkglibexecdir)\n"))))))
- (build-system gnu-build-system)
(outputs (list "out" "ppd"))
- (home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
- (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.
+ (build-system gnu-build-system)
(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-network-build"
,(string-append "--prefix=" (assoc-ref %outputs "out"))
@@ -576,13 +570,6 @@ should only be used as part of the Guix cups-pk-helper
service.")
,(string-append "--with-systraydir="
(assoc-ref %outputs "out") "/etc/xdg")
"--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
(modify-phases %standard-phases
(add-after 'unpack 'fix-hard-coded-file-names
@@ -676,12 +663,12 @@ should only be used as part of the Guix cups-pk-helper
service.")
(chmod file #o755)))
(find-files "." (lambda (file stat)
(eq? 'symlink (stat:type
stat))))))))))))
-
;; Note that the error messages printed by the tools in the case of
;; missing dependencies are often downright misleading.
;; TODO: hp-toolbox still fails to start with:
;; from dbus.mainloop.pyqt5 import DBusQtMainLoop
;; ModuleNotFoundError: No module named 'dbus.mainloop.pyqt5'
+ (native-inputs (list perl pkg-config))
(inputs
`(("cups-minimal" ,cups-minimal)
("dbus" ,dbus)
@@ -694,8 +681,14 @@ should only be used as part of the Guix cups-pk-helper
service.")
("python-wrapper" ,python-wrapper)
("sane-backends" ,sane-backends-minimal)
("zlib" ,zlib)))
- (native-inputs
- (list perl pkg-config))))
+ (home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
+ (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
(package/inherit hplip
- 10/25: gnu: python-pluggy: Update to 1.0.0., (continued)
- 10/25: gnu: python-pluggy: Update to 1.0.0., guix-commits, 2023/04/15
- 15/25: gnu: hplip: Update to 3.22.10., guix-commits, 2023/04/15
- 17/25: gnu: hplip: Use gexps., guix-commits, 2023/04/15
- 20/25: gnu: iptables: Clean-up configure flags., guix-commits, 2023/04/15
- 22/25: gnu: libxkbcommon: Unconditionally add wayland to native-inputs., guix-commits, 2023/04/15
- 18/25: gnu: hplip: Remove input labels., guix-commits, 2023/04/15
- 06/25: gnu: ghc-9.2: Make the skip-T21694-i686 phase unconditional., guix-commits, 2023/04/15
- 07/25: gnu: openldap: Update to 2.6.3., guix-commits, 2023/04/15
- 11/25: gnu: wrap-python3: Replace assoc-ref call with gexp variable., guix-commits, 2023/04/15
- 14/25: gnu: python-pytest-7.1: Deprecate package., guix-commits, 2023/04/15
- 16/25: gnu: hplip: Re-order fields.,
guix-commits <=
- 23/25: gnu: libxkbcommon: Fix indentation., guix-commits, 2023/04/15
- 24/25: gnu: python-pillow: Ungraft., guix-commits, 2023/04/15
- 25/25: gnu: xkeyboard-config: Update to 2.38., guix-commits, 2023/04/15