diff options
| author | Andy Wingo <wingo@igalia.com> | 2016-10-07 22:24:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-10-08 15:44:11 +0200 |
| commit | 95264cc6b95cadb06f280e2e52b581ecf054f433 (patch) | |
| tree | e6d97e65daaa90e3f3c171e7a0e3a16b7465b4ce /gnu | |
| parent | b6dfaf17a1deca149aede6fe1c11a19ea4620555 (diff) | |
| download | patches-95264cc6b95cadb06f280e2e52b581ecf054f433.tar patches-95264cc6b95cadb06f280e2e52b581ecf054f433.tar.gz | |
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cups.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 1818220b4f..9f1ffd1778 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) |