summaryrefslogtreecommitdiff
path: root/gnu/packages/imagemagick.scm
diff options
context:
space:
mode:
authorMaxime Devos <maximedevos@telenet.be>2021-07-15 18:56:47 +0200
committerMathieu Othacehe <othacehe@gnu.org>2021-07-25 17:52:36 +0200
commita682fea916b9f3ff101a76273aa754e11d53244d (patch)
tree21643a3ecab782ddaafbe21b65efabcfa6347262 /gnu/packages/imagemagick.scm
parent52cc6394033546406b81c146d38104c1d80dc68f (diff)
downloadguix-patches-a682fea916b9f3ff101a76273aa754e11d53244d.tar
guix-patches-a682fea916b9f3ff101a76273aa754e11d53244d.tar.gz
gnu: gs-font: Rename to 'font-ghostscript'.
According to (guix)Fonts, font package names must be prefixed with 'font-'. Adjust 'gs-fonts' to follow this convention. * gnu/packages/fontutils.scm (gs-fonts)[name]: Set to "font-ghostscript". (gs-fonts): Rename variable to 'font-ghostscript'. (gs-fonts): Add deprecated package. * gnu/packages/ghostscript.scm (ghostscript)[arguments]<#:configure-flags>: Replace 'gs-fonts' with 'font-ghostscript'. (ghostscript)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[inputs]: Likewise. * gnu/packages/gtk.scm (pango-1.42)[arguments]{disable-layout-test}: Likewise. * gnu/packages/imagemagick.scm (graphicsmagick)[arguments]{configure-flags}: Likewise. (graphicsmagick)[inputs]: Likewise. * gnu/packages/mp3.scm (ripperx)[propagated-inputs]: Likewise. * doc/guix.texi (X11 Fonts): Likewise. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'gnu/packages/imagemagick.scm')
-rw-r--r--gnu/packages/imagemagick.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 4f0ffcbcc6..f7cd961c05 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -235,12 +235,12 @@ script.")
"--with-quantum-depth=16" ; required by Octave
"--enable-quantum-library-names"
(string-append "--with-gs-font-dir="
- (assoc-ref %build-inputs "gs-fonts")
+ (assoc-ref %build-inputs "font-ghostscript")
"/share/fonts/type1/ghostscript"))))
(inputs
`(("graphviz" ,graphviz)
("ghostscript" ,ghostscript)
- ("gs-fonts" ,gs-fonts)
+ ("font-ghostscript" ,font-ghostscript)
("lcms" ,lcms)
("libx11" ,libx11)
("libxml2" ,libxml2)