me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2023-05-20 15:57:13 +02:00
parent d5ca1a7243
commit 9fa92acbf0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/self.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -72,7 +72,8 @@
("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal))
("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain)) ("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain))
("glibc-utf8-locales" . ,(ref 'base 'glibc-utf8-locales)) ("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))))) ("texinfo" . ,(ref 'texinfo 'texinfo)))))
(define (specification->package name) (define (specification->package name)
@ -404,6 +405,9 @@ a list of extra files, such as '(\"contributing\")."
(define graphviz (define graphviz
(specification->package "graphviz")) (specification->package "graphviz"))
(define font-ghostscript
(specification->package "font-ghostscript"))
(define glibc-utf8-locales (define glibc-utf8-locales
(specification->package "glibc-utf8-locales")) (specification->package "glibc-utf8-locales"))
@ -444,6 +448,9 @@ a list of extra files, such as '(\"contributing\")."
;; Build graphs. ;; Build graphs.
(mkdir-p (string-append #$output "/images")) (mkdir-p (string-append #$output "/images"))
(setenv "XDG_DATA_DIRS" ;fonts needed by 'dot'
#+(file-append font-ghostscript "/share"))
(for-each (lambda (dot-file) (for-each (lambda (dot-file)
(invoke #+(file-append graphviz "/bin/dot") (invoke #+(file-append graphviz "/bin/dot")
"-Tpng" "-Gratio=.9" "-Gnodesep=.005" "-Tpng" "-Gratio=.9" "-Gnodesep=.005"