TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: guix: Depend on 'graphviz-minimal'.

Browse source 
* gnu/packages/package-management.scm (guix)[arguments]: Add
'set-font-path' phase.
[native-inputs]: Change GRAPHVIZ to GRAPHVIZ-MINIMAL.  Add
FONT-GHOSTSCRIPT.
(guix-daemon)[native-inputs]: Remove "font-ghostscript".
[arguments]: Delete 'set-font-path' phase.
This commit is contained in:
Ludovic Courtès 2023-05-20 17:22:59 +02:00
parent 9fa92acbf0
commit e54d574add
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/package-management.scm
View file

@ -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 code
("automake" ,automake)
("gettext" ,gettext-minimal)
("texinfo" ,texinfo)
("graphviz" ,graphviz)
("graphviz" ,graphviz-minimal)
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
("help2man" ,help2man)
("po4a" ,po4a)))
(inputs
@ -527,7 +536,7 @@ (define-public guix-daemon
;; Use a minimum set of dependencies.
(native-inputs
(modify-inputs (package-native-inputs guix)
(delete "po4a" "graphviz" "help2man")))
(delete "po4a" "graphviz" "font-ghostscript" "help2man")))
(inputs
(modify-inputs (package-inputs guix)
(delete "boot-guile" "boot-guile/i686" "util-linux")
@ -546,6 +555,7 @@ (define-public guix-daemon
#f)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(delete 'set-font-path)
(add-after 'unpack 'change-default-guix
(lambda _
;; We need to tell 'guix-daemon' which 'guix' command to use.