diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/packages/imagemagick.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/packages/imagemagick.scm')
| -rw-r--r-- | gnu/packages/imagemagick.scm | 12 |
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") |