From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH 2/3] gnu: cups-filters: Use ghostscript with CUPS driver. Date: Mon, 10 Oct 2016 15:30:00 +0200 Message-ID: <20161010133001.10573-2-wingo@igalia.com> References: <20161010133001.10573-1-wingo@igalia.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btaer-0001qE-QH for guix-devel@gnu.org; Mon, 10 Oct 2016 09:30:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btaep-0002Hw-SC for guix-devel@gnu.org; Mon, 10 Oct 2016 09:30:20 -0400 Received: from pb-sasl1.pobox.com ([64.147.108.66]:63176 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btaep-0002Hk-Ol for guix-devel@gnu.org; Mon, 10 Oct 2016 09:30:19 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 9455B3AF24 for ; Mon, 10 Oct 2016 09:30:19 -0400 (EDT) Received: from pb-sasl1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id 8DA913AF23 for ; Mon, 10 Oct 2016 09:30:19 -0400 (EDT) Received: from clucks (unknown [109.190.228.233]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl1.pobox.com (Postfix) with ESMTPSA id 7827D3AF1E for ; Mon, 10 Oct 2016 09:30:18 -0400 (EDT) In-Reply-To: <20161010133001.10573-1-wingo@igalia.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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 3ce1157..a8f0af6 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") @@ -80,6 +88,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 @@ -89,7 +100,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) -- 2.10.1