From: "Ludovic Courtès" <ludo@gnu.org>
To: 63610@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#63610] [PATCH 3/3] gnu: guix: Depend on 'graphviz-minimal'.
Date: Sat, 20 May 2023 18:11:25 +0200 [thread overview]
Message-ID: <c42820d3d488ccfc4efa61b9d07cae65c73c7d8f.1684598152.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1684598152.git.ludo@gnu.org>
* 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
--
2.40.1
next prev parent reply other threads:[~2023-05-20 16:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 16:01 [bug#63610] [PATCH 0/3] Add 'graphviz-minimal' and have Guix depend on it Ludovic Courtès
2023-05-20 16:11 ` [bug#63610] [PATCH 1/3] gnu: graphviz: Add "minimal" variant Ludovic Courtès
2023-05-20 16:11 ` [bug#63610] [PATCH 2/3] self: Build against "graphviz-minimal" Ludovic Courtès
2023-05-20 16:11 ` Ludovic Courtès [this message]
2023-05-24 13:06 ` bug#63610: [PATCH 0/3] Add 'graphviz-minimal' and have Guix depend on it Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c42820d3d488ccfc4efa61b9d07cae65c73c7d8f.1684598152.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=63610@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).