aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/fonts.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-06 12:00:29 +0200
commit933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch)
treef10581ed0da1911eed9b02e69d999ba481d9d3c6 /gnu/packages/fonts.scm
parentf8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff)
parent998afc3608242b75051f43ece36d52474c51e285 (diff)
downloadguix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar
guix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/fonts.scm')
-rw-r--r--gnu/packages/fonts.scm71
1 files changed, 35 insertions, 36 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8aa5a0dc33..65d53896e8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -33,10 +33,12 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
- #:use-module (gnu packages zip)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages pkg-config))
+ #:use-module (gnu packages zip))
(define-public font-inconsolata
(package
@@ -260,47 +262,44 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.")
(define-public font-gnu-freefont-ttf
(package
(name "font-gnu-freefont-ttf")
- (version "20100919")
+ (version "20120503")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/freefont/freefont-ttf-"
+ (uri (string-append "mirror://gnu/freefont/freefont-src-"
version ".tar.gz"))
(sha256
(base32
- "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4"))))
- (build-system trivial-build-system)
+ "0yk58blhcd4hm7nyincmqq4jrzjjk82wif2zmk1l3y2m4vif4qhd"))))
+ (build-system gnu-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils)
- (srfi srfi-26))
-
- (let ((tar (string-append (assoc-ref %build-inputs
- "tar")
- "/bin/tar"))
- (PATH (string-append (assoc-ref %build-inputs
- "gzip")
- "/bin"))
- (font-dir (string-append %output
- "/share/fonts/truetype"))
- (doc-dir (string-append %output "/share/doc/"
- ,name "-" ,version)))
- (setenv "PATH" PATH)
- (system* tar "xvf" (assoc-ref %build-inputs "source"))
-
- (mkdir-p font-dir)
- (mkdir-p doc-dir)
- (chdir (string-append "freefont-" ,version))
- (for-each (lambda (file)
- (let ((dir (if (string-suffix? "ttf" file)
- font-dir
- doc-dir)))
+ `(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda _
+ (let ((doc-dir (string-append %output "/share/doc/"
+ ,name "-" ,version))
+ (font-dir (string-append %output
+ "/share/fonts/truetype")))
+ (mkdir-p doc-dir)
+ (substitute* "Makefile"
+ (("\\$\\(TMPDIR\\)") doc-dir)
+ (("sfd/\\*.ttf") ""))
+ (system* "make" "ttftar")
+ (mkdir-p font-dir)
+ (for-each (lambda (file)
(copy-file file
- (string-append dir "/" file))))
- (find-files "." ""))))))
- (native-inputs `(("source" ,source)
- ("tar" ,tar)
- ("gzip" ,gzip)))
+ (string-append font-dir "/"
+ (basename file))))
+ (filter
+ (lambda (file) (string-suffix? "ttf" file))
+ (find-files "." "")))))))
+ #:test-target "tests"))
+ ;; replace python 3 with python 2
+ ;; python 3 support commits aren't yet released in 20120503
+ ;; so freefont needs python 2 support in fontforge
+ (native-inputs `(("fontforge" ,(package (inherit fontforge)
+ (inputs `(("python-2" ,python-2)
+ ,@(package-inputs fontforge)))))))
(home-page "http://www.gnu.org/software/freefont/")
(synopsis "Unicode-encoded outline fonts")
(description