summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-08-17 16:16:04 +0800
committer宋文武 <iyzsong@gmail.com>2015-09-06 21:52:21 +0800
commit030fa12ef2f94e0ae83c62de520aec409f42c114 (patch)
tree93910484233d283eaaca907804d671d5cf1ef3cf
parentd0f74308e22308bf2bfdbe189f09a3c8601acf1e (diff)
gnu: fontconfig: Update to 2.11.94.
* gnu/packages/fontutils.scm (fontconfig): Update to 2.11.94. [arguments]: Pass '--with-cache-dir=/var/cache/fontconfig' to configure. Add #:phases.
-rw-r--r--gnu/packages/fontutils.scm29
1 files changed, 20 insertions, 9 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 8b5346a17f..a25a2ea0e9 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -71,14 +71,14 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(define-public fontconfig
(package
(name "fontconfig")
- (version "2.11.92")
+ (version "2.11.94")
(source (origin
(method url-fetch)
(uri (string-append
"http://www.freedesktop.org/software/fontconfig/release/fontconfig-"
version ".tar.bz2"))
(sha256 (base32
- "18r45dcnaj93izwfr082qiwg8ka7ll6j0c9yf1slblm542d5pmd9"))))
+ "1psrl4b4gi4wmbvwwh43lk491wsl8lgvqj146prlcha3vwjc0qyp"))))
(build-system gnu-build-system)
(propagated-inputs `(("expat" ,expat)
("freetype" ,freetype)))
@@ -86,13 +86,24 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
- `(#:configure-flags
- ;; point to user profile instead of /usr/share/fonts in /etc/fonts.conf
- (list "--with-default-fonts=~/.guix-profile/share/fonts"
- ;; register gs-fonts
- (string-append "--with-add-fonts="
- (assoc-ref %build-inputs "gs-fonts")
- "/share/fonts"))))
+ `(#:configure-flags
+ (list "--with-cache-dir=/var/cache/fontconfig"
+ ;; register gs-fonts as default fonts
+ (string-append "--with-default-fonts="
+ (assoc-ref %build-inputs "gs-fonts")
+ "/share/fonts")
+ ;; register fonts from user profile
+ "--with-add-fonts=~/.guix-profile/share/fonts"
+ ;; python is not actually needed
+ "PYTHON=false")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ ;; Don't try to create /var/cache/fontconfig.
+ (zero? (system* "make" "install"
+ "fc_cachedir=$(TMPDIR)"
+ "RUN_FC_CACHE_TEST=false")))))))
(synopsis "Library for configuring and customizing font access")
(description
"Fontconfig can discover new fonts when installed automatically;