gnu: fontutils: Add 'bash' input for 'wrap-program'.

It is required for cross-compilation.

* gnu/packages/fontutils.scm
(fontforge): Adjust indentation.
[inputs]: Add 'bash-minimal'.  Remove labels.
(fntsample)[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ib3498e8ab1e499db6bc512da31718690e46f90f1
This commit is contained in:
Maxime Devos 2021-07-02 12:07:02 +02:00 committed by Maxim Cournoyer
parent 71dcacac0c
commit 3f2c6cc393
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -1522,26 +1522,28 @@ (define-public fontforge
(build-system cmake-build-system)
(native-inputs
(list pkg-config))
(inputs `(("cairo" ,cairo)
("fontconfig" ,fontconfig) ;dlopen'd
("freetype" ,freetype)
("gettext" ,gettext-minimal)
("libICE" ,libice)
("libSM" ,libsm)
("libX11" ,libx11)
("libXi" ,libxi)
("libjpeg" ,libjpeg-turbo)
("libltdl" ,libltdl)
("libpng" ,libpng)
("libspiro" ,libspiro)
("libtiff" ,libtiff)
("libungif" ,libungif)
("libxft" ,libxft)
("libxml2" ,libxml2)
("pango" ,pango)
("potrace" ,potrace)
("python" ,python)
("zlib" ,zlib)))
(inputs
(list cairo
bash-minimal
fontconfig ;dlopen'd
freetype
gettext-minimal
libice
libsm
libx11
libxi
libjpeg-turbo
libltdl
libpng
libspiro
libtiff
libungif
libxft
libxml2
pango
potrace
python
zlib))
(arguments
(list
#:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
@ -1556,8 +1558,7 @@ (define-public fontforge
;; already does the right thing.
(substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)")
""))
#t))
""))))
#$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch
(lambda _
@ -1600,8 +1601,7 @@ (define-public fontforge
"libxml2" "zlib" "libspiro" "freetype"
"pango" "cairo" "fontconfig")))
;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace)))
#t))))))
`("PATH" ":" prefix (,potrace)))))))))
(synopsis "Outline font editor")
(description
"FontForge allows you to create and modify postscript, truetype and
@ -1923,6 +1923,7 @@ (define-public fntsample
("gettext" ,gettext-minimal)))
(inputs
`(("cairo" ,cairo)
("bash-minimal", bash-minimal)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)