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

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 95264cc6b95cadb06f280e2e52b581ecf054f433
Author: Andy Wingo <address@hidden>
Date:   Fri Oct 7 22:24:23 2016 +0200

    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 <address@hidden>
---
 gnu/packages/cups.scm |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 1818220..9f1ffd1 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -40,6 +40,14 @@
   #:use-module (gnu packages pkg-config)
   #: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
   (package
     (name "cups-filters")
@@ -74,6 +82,9 @@
        `(,(string-append "--with-test-font-path="
                          (assoc-ref %build-inputs "font-dejavu")
                          "/share/fonts/truetype/DejaVuSans.ttf")
+         ,(string-append "--with-gs-path="
+                         (assoc-ref %build-inputs "ghostscript")
+                         "/bin/gsc")
          ,(string-append "--with-rcdir="
                          (assoc-ref %outputs "out") "/etc/rc.d"))))
     (native-inputs
@@ -84,7 +95,7 @@
        ("fontconfig"   ,fontconfig)
        ("freetype"     ,freetype)
        ("font-dejavu"  ,font-dejavu) ;needed by test suite
-       ("ghostscript"  ,ghostscript)
+       ("ghostscript"  ,(force ghostscript/cups))
        ("ijs"          ,ijs)
        ("dbus"         ,dbus)
        ("lcms"         ,lcms)