summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-09 13:53:13 +0200
committerMarius Bakke <marius@gnu.org>2022-09-09 23:00:21 +0200
commitef614fd39e88941bd18758c91b0e4740a0c2a31e (patch)
treee1f7c7932f10555429b8324a5d1c8770608a11d3
parenta7adf473fcde46714d17850f3e597af239efb7de (diff)
gnu: graphicsmagick: Remove input labels.
* gnu/packages/imagemagick.scm (graphicsmagick)[inputs]: Remove labels. [arguments]: Use SEARCH-INPUT-DIRECTORY.
-rw-r--r--gnu/packages/imagemagick.scm32
1 files changed, 16 insertions, 16 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index b10e3f68cd..6548c0c8ac 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -235,23 +235,23 @@ script.")
"--with-quantum-depth=16" ; required by Octave
"--enable-quantum-library-names"
(string-append "--with-gs-font-dir="
- (assoc-ref %build-inputs "font-ghostscript")
- "/share/fonts/type1/ghostscript"))))
+ (search-input-directory
+ %build-inputs "share/fonts/type1/ghostscript")))))
(inputs
- `(("graphviz" ,graphviz)
- ("ghostscript" ,ghostscript)
- ("font-ghostscript" ,font-ghostscript)
- ("lcms" ,lcms)
- ("libx11" ,libx11)
- ("libxml2" ,libxml2)
- ("libtiff" ,libtiff)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)
- ("libwebp" ,libwebp)
- ("freetype" ,freetype)
- ("bzip2" ,bzip2)
- ("xz" ,xz)
- ("zlib" ,zlib)))
+ (list bzip2
+ font-ghostscript
+ freetype
+ ghostscript
+ graphviz
+ lcms
+ libjpeg-turbo
+ libpng
+ libtiff
+ libwebp
+ libxml2
+ libx11
+ xz
+ zlib))
(native-inputs
(list pkg-config))
(outputs '("out" ; 13 MiB