ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 21:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fontconfig: Add a search path for XDG_DATA_DIRS.

Browse source 
Fixes <https://issues.guix.gnu.org/31403>.

* gnu/packages/fontutils.scm (fontconfig)[source]: Fix indentation.
[configure-flags]: Drop the "--with-add-fonts" configure option as it's no
longer necessary/desirable to special case the system and user profiles.
[native-search-paths]: New search path.
This commit is contained in:
Maxim Cournoyer 2021-08-03 20:49:16 -04:00
parent 9635119a61
commit c738a054ca
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/fontutils.scm
View file

@ -326,14 +326,13 @@ (define-public fontconfig
(name "fontconfig-minimal") (name "fontconfig-minimal")
(version "2.13.94") (version "2.13.94")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://www.freedesktop.org/software/" "https://www.freedesktop.org/software/"
"fontconfig/release/fontconfig-" version ".tar.xz")) "fontconfig/release/fontconfig-" version ".tar.xz"))
(sha256 (sha256 (base32
(base32 "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55"))
"0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55")) (patches (search-patches "fontconfig-cache-ignore-mtime.patch"))))
(patches (search-patches "fontconfig-cache-ignore-mtime.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; In Requires or Requires.private of fontconfig.pc. ;; In Requires or Requires.private of fontconfig.pc.
(propagated-inputs `(("expat" ,expat) (propagated-inputs `(("expat" ,expat)
@ -355,12 +354,7 @@ (define-public fontconfig
;; register the default fonts ;; register the default fonts
(string-append "--with-default-fonts=" (string-append "--with-default-fonts="
(assoc-ref %build-inputs "font-dejavu") (assoc-ref %build-inputs "font-dejavu")
"/share/fonts") "/share/fonts"))
;; Register fonts from user and system profiles.
(string-append "--with-add-fonts="
"~/.guix-profile/share/fonts,"
"/run/current-system/profile/share/fonts"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'skip-problematic-tests (add-before 'check 'skip-problematic-tests
@ -392,6 +386,12 @@ (define-public fontconfig
; The exact license is more X11-style than BSD-style. ; The exact license is more X11-style than BSD-style.
(license (license:non-copyleft "file://COPYING" (license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(native-search-paths
;; Since version 2.13.94, fontconfig knows to find fonts from
;; XDG_DATA_DIRS.
(list (search-path-specification
(variable "XDG_DATA_DIRS")
(files '("share")))))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))))
;;; The documentation of fontconfig is built in a separate package, as it ;;; The documentation of fontconfig is built in a separate package, as it