diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 11:05:41 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-12-29 13:38:43 -0500 |
| commit | 067f28a7d715f3bced41e0159e3372016129a84c (patch) | |
| tree | 6612f2ba34bde09ab4df496922b3210cb0d80b6c | |
| parent | 951610567f623512a88ac20b879e00d442f85abe (diff) | |
| download | guix-067f28a7d715f3bced41e0159e3372016129a84c.tar.gz guix-067f28a7d715f3bced41e0159e3372016129a84c.zip | |
gnu: fontconfig: Use 'font-dejavu' and remove replacement.
* gnu/packages/fontutils.scm (fontconfig)[replacement]: Remove.
[inputs]: Replace GS-FONTS by FONT-DEJAVU.
[arguments]: Adjust accordingly.
(fontconfig/font-dejavu): Remove.
| -rw-r--r-- | gnu/packages/fontutils.scm | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 1b6f72d22b..2775ebdab9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -326,12 +326,6 @@ Font Format (WOFF).") (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 @@ Font Format (WOFF).") (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 @@ 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") |