gnu: cups-filters: Use ghostscript with CUPS driver.

* gnu/packages/cups.scm (ghostscript/cups): New variable.
  (cups-filters): Use ghostscript/cups.  Capture path to "gs" at
  compilation time.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Andy Wingo 2016-10-07 22:24:23 +02:00 committed by Ludovic Courtès
parent b6dfaf17a1
commit 95264cc6b9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 1 deletions

View File

@ -40,6 +40,14 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)) #:use-module (gnu packages tls))
;; Delay to avoid module circularity problems.
(define ghostscript/cups
(delay
(package (inherit ghostscript)
(name "ghostscript-with-cups")
(inputs `(("cups" ,cups-minimal)
,@(package-inputs ghostscript))))))
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
@ -74,6 +82,9 @@
`(,(string-append "--with-test-font-path=" `(,(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="
(assoc-ref %build-inputs "ghostscript")
"/bin/gsc")
,(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
@ -84,7 +95,7 @@
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("font-dejavu" ,font-dejavu) ;needed by test suite ("font-dejavu" ,font-dejavu) ;needed by test suite
("ghostscript" ,ghostscript) ("ghostscript" ,(force ghostscript/cups))
("ijs" ,ijs) ("ijs" ,ijs)
("dbus" ,dbus) ("dbus" ,dbus)
("lcms" ,lcms) ("lcms" ,lcms)