From patchwork Mon Jun 14 15:38:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30250 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D6CEC27BC81; Mon, 14 Jun 2021 16:53:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9337427BC78 for ; Mon, 14 Jun 2021 16:53:08 +0100 (BST) Received: from localhost ([::1]:44208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsotf-0001mv-MH for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog5-00035O-2L for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog4-0007l9-QC for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog4-0004JW-On for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 27/37] fontconfig: Make the #:configure-flags argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368512716472 (code B ref 49025); Mon, 14 Jun 2021 15:39:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:47 +0000 Received: from localhost ([127.0.0.1]:47597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofn-0004Hc-5e for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:47 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofm-0004AR-6V for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:46 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3el2500L0mfAB4063el5Y; Mon, 14 Jun 2021 17:38:45 +0200 Message-ID: <008530a77ab5e357e737ff63d4594ceeaaf76a62.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:45 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685125; bh=Tob/oPvFnoA1kgM2N+Dv+i+7eWQPp7DgUwlFvYv3VIo=; h=Subject:From:To:Date:In-Reply-To:References; b=q2ppO3lttRap0x8sBFTlRtsXbgxiwU8E9JV14jzx5s6fibMMGCJqr7Bg84EfNEtdf 5uhPvXM6n/SvNpb8zqEYPnE5tGTYsOsi63yHLiToIv0bbUK/PXoDTvYlL5tAmfbYV6 LZfy/idDKgK8KXYpaa1MXNDtPb04tT8m9Z6ruPWPVqo0XRt1SqT24/y3kTL6zA55gM gfCyG/9ZI09oyyrbdfkMPoTTeTirJhsWsPyFYCD7123l+1s6wznu6x9Cvc2FIhiqv0 phzHOiBhbdFfaqVjpEwlRymcu0f4MMAlzUNS6bygG8wKdZobNh4acLCwpMg/PLQC3J zEAH1fvIG+JRw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using #$(this-package-input ...) later. * gnu/packages/fontutils.scm (fontconfig)[arguments]<#:configure-flags>: Make this a G-expression instead of a raw S-expression. (fontconfig-with-documentation)[arguments]<#:configure-flags>: Likewise. --- gnu/packages/fontutils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index dbce5beba8..234f11129a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tex) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix svn-download) @@ -347,6 +348,7 @@ Font Format (WOFF).") ("python" ,python-minimal))) ;to avoid a cycle through tk (arguments `(#:configure-flags + ,#~ (list "--disable-docs" "--with-cache-dir=/var/cache/fontconfig" ;; register the default fonts @@ -400,7 +402,7 @@ high quality, anti-aliased and subpixel rendered text on a display.") (arguments (substitute-keyword-arguments (package-arguments fontconfig) ((#:configure-flags configure-flags) - `(delete "--disable-docs" ,configure-flags)) + #~(delete "--disable-docs" #$configure-flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'install 'move-man-sections