diff options
author | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
commit | 4193095e18b602705df94e38a8d60ef1fe380e49 (patch) | |
tree | 2500f31bcfae9b4cb5a23d633395f6892a7bd8a7 /gnu/packages/fontutils.scm | |
parent | a48a3f0640d76cb5e5945557c9aae6dabce39d93 (diff) | |
parent | e88745a655b220b4047f7db5175c828ef9c33e11 (diff) | |
download | guix-patches-4193095e18b602705df94e38a8d60ef1fe380e49.tar guix-patches-4193095e18b602705df94e38a8d60ef1fe380e49.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/fontutils.scm')
-rw-r--r-- | gnu/packages/fontutils.scm | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3e9343ecbc..09793f93de 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) + #:use-module (gnu packages fonts) #:use-module (gnu packages gettext) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -292,6 +293,12 @@ fonts to/from the WOFF2 format.") (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) @@ -348,6 +355,13 @@ high quality, anti-aliased and subpixel rendered text on a display.") "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") |