From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ricardo Wurmus <rekado@elephly.net>
Subject: Re: [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver.
Date: Sun, 09 Oct 2016 16:17:38 +0200
Message-ID: <87y41xfvy5.fsf@elephly.net>
References: <20161007202424.26732-1-wingo@igalia.com>
	<20161007202424.26732-2-wingo@igalia.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51738)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1btEvH-00039q-FN
	for guix-devel@gnu.org; Sun, 09 Oct 2016 10:17:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1btEvD-0002V2-3s
	for guix-devel@gnu.org; Sun, 09 Oct 2016 10:17:50 -0400
Received: from sender163-mail.zoho.com ([74.201.84.163]:21373)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1btEvC-0002Uw-Rz
	for guix-devel@gnu.org; Sun, 09 Oct 2016 10:17:47 -0400
In-reply-to: <20161007202424.26732-2-wingo@igalia.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Andy Wingo <wingo@igalia.com>
Cc: guix-devel@gnu.org


Andy Wingo <wingo@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