mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fontconfig: Use 'font-dejavu' and remove replacement.

Browse source 
* gnu/packages/fontutils.scm (fontconfig)[replacement]: Remove.
[inputs]: Replace GS-FONTS by FONT-DEJAVU.
[arguments]: Adjust accordingly.
(fontconfig/font-dejavu): Remove.
This commit is contained in:
Ludovic Courtès 2020-12-08 11:05:41 +01:00 committed by Maxim Cournoyer
parent 951610567f
commit 067f28a7d7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/fontutils.scm
View file

@ -326,12 +326,6 @@ (define-public woff2
(define-public fontconfig
(package
(name "fontconfig")
;; This replacement is not security-related, but works around the fact
;; that gs-fonts are not recognized by newer versions of Pango, causing
;; many applications to fail to find fonts otherwise.
(replacement fontconfig/font-dejavu)
(version "2.13.1")
(source (origin
(method url-fetch)
@ -347,16 +341,19 @@ (define-public fontconfig
(propagated-inputs `(("expat" ,expat)
("freetype" ,freetype)
("libuuid" ,util-linux "lib")))
(inputs `(("gs-fonts" ,gs-fonts)))
(inputs
;; We use to use 'gs-fonts' but they are not recognized by newer versions
;; of Pango, causing many applications to fail to find fonts otherwise.
`(("font-dejavu" ,font-dejavu)))
(native-inputs
`(("gperf" ,gperf)
("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list "--with-cache-dir=/var/cache/fontconfig"
;; register gs-fonts as default fonts
;; register the default fonts
(string-append "--with-default-fonts="
(assoc-ref %build-inputs "gs-fonts")
(assoc-ref %build-inputs "font-dejavu")
"/share/fonts")
;; Register fonts from user and system profiles.
@ -411,13 +408,6 @@ (define-public fontconfig
"See COPYING in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))
(define fontconfig/font-dejavu
(package
(inherit fontconfig)
(inputs
;; XXX: Reuse the name to avoid having to override the configure flags.
`(("gs-fonts" ,font-dejavu)))))
(define-public t1lib
(package
(name "t1lib")