Andy Wingo <wi...@igalia.com> writes:
> * gnu/packages/cups.scm (ghostscript/cups): New variable.
> (cups-filters): Use ghostscript/cups. Capture path to "gs" at
> compilation time.
> ---
> 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 d22338d..8394bfb 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")
> @@ -78,6 +86,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
> @@ -87,7 +98,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)
This also looks good to me.
~~ Ricardo
