summaryrefslogtreecommitdiff
path: root/gnu/packages/imagemagick.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <[email protected]>2022-01-25 22:07:13 -0500
committerMaxim Cournoyer <[email protected]>2022-01-25 22:07:13 -0500
commit1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch)
treeac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/imagemagick.scm
parent3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff)
parent070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff)
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/imagemagick.scm')
-rw-r--r--gnu/packages/imagemagick.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 4f0ffcbcc6..06ed80cbac 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -127,7 +127,7 @@
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs (list pkg-config))
(outputs '("out"
"doc")) ; 26 MiB of HTML documentation
(home-page "https://www.imagemagick.org/")
@@ -175,8 +175,8 @@ text, lines, polygons, ellipses and Bézier curves.")
(base32
"0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"))))
(build-system perl-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("imagemagick" ,imagemagick)))
+ (native-inputs (list pkg-config))
+ (inputs (list imagemagick))
(arguments
`(#:tests? #f ;;Failed 2/23 test programs. 2/353 subtests failed.
#:phases
@@ -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)
@@ -253,7 +253,7 @@ script.")
("xz" ,xz)
("zlib" ,zlib)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ (list pkg-config))
(outputs '("out" ; 13 MiB
"doc")) ; ~7 MiB
(home-page "http://www.graphicsmagick.org")