From patchwork Sat May 20 16:11:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50166 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 3997527BBEA; Sat, 20 May 2023 17:12:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D6A627BBE2 for ; Sat, 20 May 2023 17:12:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0PBf-0001e1-84; Sat, 20 May 2023 12:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0PBb-0001da-Tt for guix-patches@gnu.org; Sat, 20 May 2023 12:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0PBa-0008L7-Px for guix-patches@gnu.org; Sat, 20 May 2023 12:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0PBa-0005im-Go for guix-patches@gnu.org; Sat, 20 May 2023 12:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63610] [PATCH 3/3] gnu: guix: Depend on 'graphviz-minimal'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 May 2023 16:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63610 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63610@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 63610-submit@debbugs.gnu.org id=B63610.168459910421953 (code B ref 63610); Sat, 20 May 2023 16:12:02 +0000 Received: (at 63610) by debbugs.gnu.org; 20 May 2023 16:11:44 +0000 Received: from localhost ([127.0.0.1]:59215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0PBH-0005hw-K5 for submit@debbugs.gnu.org; Sat, 20 May 2023 12:11:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0PBE-0005hP-V8 for 63610@debbugs.gnu.org; Sat, 20 May 2023 12:11:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0PB9-0008Im-P6; Sat, 20 May 2023 12:11:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=92YK+nLU98ODVjXF2F4+6xPCWctG06ds9C/D/5Geq/E=; b=g68VIT9ycEmjPIE/Jne+ /NorQ+X0aHyspEPjkyYsR0Q1Anly/MUtXkGpTjQrDeM/7Zi7/+viYxa40vKNvZo4Q6PVSPC19aJ2t qZCS3jUrGYi6BMEogx/hLi1cQT/uTbj/kDCZV9eY/Tqh315wC1Wg8TvzYB7ciYer1a3w/1TveRBV4 vmvKRPa+q85NI0+citK9AhBB0bOy/ZFRuO3J1OMULJkul1qd5vmKLU3oY4qkzkzJjTE2f/xeW7uj8 WSVkQscbobw2mQK1WeAZe9wjdry9iD3ILexj/VapUlAEK7ma1JQWA8bxLKGrG6SODvbo7B2Xac8rB JK1uSV68r+IRzw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0PB7-0001oj-SW; Sat, 20 May 2023 12:11:35 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 20 May 2023 18:11:25 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (guix)[arguments]: Add 'set-font-path' phase. [native-inputs]: Change GRAPHVIZ to GRAPHVIZ-MINIMAL. Add FONT-GHOSTSCRIPT. --- gnu/packages/package-management.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 67de4930ff..1da40f4cab 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -68,6 +68,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -273,6 +274,13 @@ (define-public guix (("\"[^\"]*/bin//xz") (string-append "\"" xz "/bin/xz"))))) #t)) + (add-before 'build 'set-font-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Tell 'dot' where to look for fonts. + (setenv "XDG_DATA_DIRS" + (dirname + (search-input-directory inputs + "share/fonts"))))) (add-before 'check 'copy-bootstrap-guile (lambda* (#:key system target inputs #:allow-other-keys) ;; Copy the bootstrap guile tarball in the store @@ -431,7 +439,8 @@ (define-public guix ("automake" ,automake) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) - ("graphviz" ,graphviz) + ("graphviz" ,graphviz-minimal) + ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot' ("help2man" ,help2man) ("po4a" ,po4a))) (inputs