summaryrefslogtreecommitdiff
path: root/gnu/packages/cups.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-07-26 18:15:13 +0200
committerLudovic Courtès <ludo@gnu.org>2018-07-26 18:15:13 +0200
commitac46a1c8e465df81d661632a273d07443aefa24e (patch)
treee969b5f54a1d0607dd867a646e557dc1579763e6 /gnu/packages/cups.scm
parent3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f (diff)
parent92526ade57e0bd23ab4025b8532511ef80df5fba (diff)
downloadguix-patches-ac46a1c8e465df81d661632a273d07443aefa24e.tar
guix-patches-ac46a1c8e465df81d661632a273d07443aefa24e.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cups.scm')
-rw-r--r--gnu/packages/cups.scm19
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index a99f2f22bf..5e852501ce 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
@@ -46,7 +46,9 @@
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix packages))
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (srfi srfi-1))
(define-public cups-filters
(package
@@ -506,6 +508,19 @@ device-specific programs to convert and print many types of files.")
`(("perl" ,perl)
("pkg-config" ,pkg-config)))))
+(define-public hplip-minimal
+ (package
+ (inherit hplip)
+ (name "hplip-minimal")
+ (arguments
+ (substitute-keyword-arguments (package-arguments hplip)
+ ((#:configure-flags cf)
+ `(delete "--enable-qt5" ,cf))))
+ (inputs
+ (fold alist-delete (package-inputs hplip)
+ '("python-pygobject" "python-pyqt")))
+ (synopsis "GUI-less version of hplip")))
+
(define-public foomatic-filters
(package
(name "foomatic-filters")