mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 19:39:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/fontutils.scm
View file

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