gnu: cups-filters: Update to 1.13.1.

* gnu/packages/cups.scm (cups-filters): Update to 1.13.1.
[inputs]: Switch libjpeg-8 to libjpeg.
[arguments]: Disable driverless printing, set location for bash shell.
This commit is contained in:
Efraim Flashner 2016-12-25 06:50:57 +02:00 committed by Mark H Weaver
parent b4c8c413ca
commit f8489f160b
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 9 additions and 5 deletions

View File

@ -51,7 +51,7 @@
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.11.5") (version "1.13.1")
(source(origin (source(origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -59,7 +59,7 @@
"cups-filters-" version ".tar.xz")) "cups-filters-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hcp1cfx1a71aa6fyayajjh7vw1ia7zya6981gz73vsy2pdb23qf")) "0s7hylp2lcvc1vrqpywpv7lspkrh4xf7cyi4nbg10cf38rshj474"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; install backends, banners and filters to cups-filters output ;; install backends, banners and filters to cups-filters output
@ -85,12 +85,16 @@
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" %output)) `(#:make-flags (list (string-append "PREFIX=" %output))
#:configure-flags #:configure-flags
`(,(string-append "--with-test-font-path=" `("--disable-driverless" ; TODO: enable this
,(string-append "--with-test-font-path="
(assoc-ref %build-inputs "font-dejavu") (assoc-ref %build-inputs "font-dejavu")
"/share/fonts/truetype/DejaVuSans.ttf") "/share/fonts/truetype/DejaVuSans.ttf")
,(string-append "--with-gs-path=" ,(string-append "--with-gs-path="
(assoc-ref %build-inputs "ghostscript") (assoc-ref %build-inputs "ghostscript")
"/bin/gsc") "/bin/gsc")
,(string-append "--with-shell="
(assoc-ref %build-inputs "bash")
"/bin/bash")
,(string-append "--with-rcdir=" ,(string-append "--with-rcdir="
(assoc-ref %outputs "out") "/etc/rc.d")))) (assoc-ref %outputs "out") "/etc/rc.d"))))
(native-inputs (native-inputs
@ -100,12 +104,12 @@
`(("avahi" ,avahi) `(("avahi" ,avahi)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("font-dejavu" ,font-dejavu) ;needed by test suite ("font-dejavu" ,font-dejavu) ; also needed by test suite
("ghostscript" ,(force ghostscript/cups)) ("ghostscript" ,(force ghostscript/cups))
("ijs" ,ijs) ("ijs" ,ijs)
("dbus" ,dbus) ("dbus" ,dbus)
("lcms" ,lcms) ("lcms" ,lcms)
("libjpeg-8" ,libjpeg-8) ("libjpeg" ,libjpeg)
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("mupdf" ,mupdf) ("mupdf" ,mupdf)