tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code 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
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
@@ -273,6 +274,13 @@ $(prefix)/etc/openrc\n")))
(("\"[^\"]*/bin//xz") (("\"[^\"]*/bin//xz")
(string-append "\"" xz "/bin/xz"))))) (string-append "\"" xz "/bin/xz")))))
#t)) #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 (add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system target inputs #:allow-other-keys) (lambda* (#:key system target inputs #:allow-other-keys)
;; Copy the bootstrap guile tarball in the store ;; Copy the bootstrap guile tarball in the store
@@ -431,7 +439,8 @@ $(prefix)/etc/openrc\n")))
("automake" ,automake) ("automake" ,automake)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("graphviz" ,graphviz) ("graphviz" ,graphviz-minimal)
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
("help2man" ,help2man) ("help2man" ,help2man)
("po4a" ,po4a))) ("po4a" ,po4a)))
(inputs (inputs
@@ -527,7 +536,7 @@ the Nix package manager.")
;; Use a minimum set of dependencies. ;; Use a minimum set of dependencies.
(native-inputs (native-inputs
(modify-inputs (package-native-inputs guix) (modify-inputs (package-native-inputs guix)
(delete "po4a" "graphviz" "help2man"))) (delete "po4a" "graphviz" "font-ghostscript" "help2man")))
(inputs (inputs
(modify-inputs (package-inputs guix) (modify-inputs (package-inputs guix)
(delete "boot-guile" "boot-guile/i686" "util-linux") (delete "boot-guile" "boot-guile/i686" "util-linux")
@@ -546,6 +555,7 @@ the Nix package manager.")
#f) #f)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'set-font-path)
(add-after 'unpack 'change-default-guix (add-after 'unpack 'change-default-guix
(lambda _ (lambda _
;; We need to tell 'guix-daemon' which 'guix' command to use. ;; We need to tell 'guix-daemon' which 'guix' command to use.