diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 11:05:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-08 11:06:43 +0100 |
| commit | 2dfb16150e11f273fd6f991bb563bf02a8a69402 (patch) | |
| tree | eb15d815437ebdca63fad26050a5d5665c1ab823 | |
| parent | 79b31767d084a2feeb2edcb41ae863a0d534b847 (diff) | |
| download | guix-2dfb16150e11f273fd6f991bb563bf02a8a69402.tar.gz guix-2dfb16150e11f273fd6f991bb563bf02a8a69402.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 09d4b7964c..09cd214651 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -318,12 +318,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) @@ -338,16 +332,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. @@ -380,13 +377,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") |