From patchwork Sat May 20 16:11:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50167 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 11B0E27BBE9; Sat, 20 May 2023 17:12:35 +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=unavailable 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 C68AD27BBE2 for ; Sat, 20 May 2023 17:12:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0PBh-0001e6-4F; Sat, 20 May 2023 12:12:09 -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-0001db-UI 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 1q0PBb-0008LA-Gq; 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 1q0PBZ-0005iY-O8; Sat, 20 May 2023 12:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63610] [PATCH 2/3] self: Build against "graphviz-minimal". Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 20 May 2023 16:12:01 +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?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 63610-submit@debbugs.gnu.org id=B63610.168459910021931 (code B ref 63610); Sat, 20 May 2023 16:12:01 +0000 Received: (at 63610) by debbugs.gnu.org; 20 May 2023 16:11:40 +0000 Received: from localhost ([127.0.0.1]:59209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0PBD-0005hZ-QI for submit@debbugs.gnu.org; Sat, 20 May 2023 12:11:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0PBC-0005hM-Kg for 63610@debbugs.gnu.org; Sat, 20 May 2023 12:11:39 -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 1q0PB7-0008IY-EM; Sat, 20 May 2023 12:11:33 -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=5ZEhVvMICNVBFJF2oGFgN1fCdBvgGR4BWltjmiu7N/8=; b=ABdrbHVtXKgvPp1+NzEc CHYq52VfnnGIkDwVFl8+QDPkjdmdXCDGfm/frsTiohYTEXJQ73ArpGopAAw3Br0BovEK594/1qpPP NYQfvXOBnEPTxfOkDUQH+n0B6e/Yk7pjr77z2yB479bfuamFZYhXAnk0+vYnr66IF3ndrl80gccdJ HRGeezIKx7G2NQxbBeyPPDHN0eembGEVEaDec0l4WE9GRlNLYGSr9z5zRAQieeAWoXavbNb9Kc/zr 34ca8+ll8vOAnv87dheolP/Ny1+VMKjPcm96wqlfJab6JKL+G55pHKGJZKrCCCmUNje1osP59fUyi jd80mUfBPBBV5g==; 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-1r; Sat, 20 May 2023 12:11:33 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 20 May 2023 18:11:24 +0200 Message-Id: <238c5c71317fffbb2c7b88387d62b7759201c3d8.1684598152.git.ludo@gnu.org> 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 Fixes . Reported by Andreas Enge . * guix/self.scm (%packages): Change "graphviz" to refer to "graphviz-minimal". Add "font-ghostscript". (info-manual): Define 'font-ghostscript'. [build]: Set XDG_DATA_DIRS. --- guix/self.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 74c953bd50..9e0aa82698 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017-2022 Ludovic Courtès +;;; Copyright © 2017-2023 Ludovic Courtès ;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. @@ -72,7 +72,8 @@ (define %packages ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) ("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain)) ("glibc-utf8-locales" . ,(ref 'base 'glibc-utf8-locales)) - ("graphviz" . ,(ref 'graphviz 'graphviz)) + ("graphviz" . ,(ref 'graphviz 'graphviz-minimal)) + ("font-ghostscript" . ,(ref 'ghostscript 'font-ghostscript)) ("texinfo" . ,(ref 'texinfo 'texinfo))))) (define (specification->package name) @@ -404,6 +405,9 @@ (define (info-manual source) (define graphviz (specification->package "graphviz")) + (define font-ghostscript + (specification->package "font-ghostscript")) + (define glibc-utf8-locales (specification->package "glibc-utf8-locales")) @@ -444,6 +448,9 @@ (define (info-manual source) ;; Build graphs. (mkdir-p (string-append #$output "/images")) + + (setenv "XDG_DATA_DIRS" ;fonts needed by 'dot' + #+(file-append font-ghostscript "/share")) (for-each (lambda (dot-file) (invoke #+(file-append graphviz "/bin/dot") "-Tpng" "-Gratio=.9" "-Gnodesep=.005"