diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-05-20 15:57:13 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-05-24 15:04:00 +0200 |
| commit | 9fa92acbf0c4dbc734ac7d83b31bd6d12e09a401 (patch) | |
| tree | 0b31f9af4424bfc5762a28fe7ac5cd1b5a8fd167 /guix/self.scm | |
| parent | d5ca1a72436d41fa7a7ab7189c62bff1d9dfc083 (diff) | |
| download | guix-9fa92acbf0c4dbc734ac7d83b31bd6d12e09a401.tar guix-9fa92acbf0c4dbc734ac7d83b31bd6d12e09a401.tar.gz | |
self: Build against "graphviz-minimal".
Fixes <https://issues.guix.gnu.org/63050>.
Reported by Andreas Enge <andreas@enge.fr>.
* guix/self.scm (%packages): Change "graphviz" to refer to
"graphviz-minimal". Add "font-ghostscript".
(info-manual): Define 'font-ghostscript'.
[build]: Set XDG_DATA_DIRS.
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 11 |
1 files 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 <ludo@gnu.org> +;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. @@ -72,7 +72,8 @@ ("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 @@ a list of extra files, such as '(\"contributing\")." (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 @@ a list of extra files, such as '(\"contributing\")." ;; 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" |