From 4dcb3db0eebf50b85bfafbcea438ff5e29d4b89f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Feb 2017 11:35:21 +0100
Subject: [PATCH] gnu: fonts: Use install-file where appropriate.
* gnu/packages/fonts.scm (font-wqy-microhei, font-google-roboto)[arguments]:
Substitute the simpler INSTALL-FILE for every COPY-FILE invoked with redundant
arguments.
---
gnu/packages/fonts.scm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1f6d1d0c36b..43991d10348 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -525,13 +525,11 @@ (define-public font-wqy-microhei
(let ((PATH (string-append (assoc-ref %build-inputs "tar") "/bin:"
(assoc-ref %build-inputs "gzip") "/bin"))
(font-dir (string-append (assoc-ref %outputs "out")
- "/share/fonts/wenquanyi/")))
- (setenv "PATH" PATH)
+ "/share/fonts/wenquanyi")))
(mkdir-p font-dir)
+ (setenv "PATH" PATH)
(system* "tar" "xvf" (assoc-ref %build-inputs "source"))
- (chdir "wqy-microhei")
- (copy-file "wqy-microhei.ttc"
- (string-append font-dir "wqy-microhei.ttc"))))))
+ (install-file "wqy-microhei/wqy-microhei.ttc" font-dir)))))
(native-inputs
`(("gzip" ,gzip)
("tar" ,tar)))
@@ -760,8 +758,7 @@ (define-public font-google-roboto
(mkdir-p font-dir)
(chdir "roboto-hinted")
(for-each (lambda (ttf)
- (copy-file ttf
- (string-append font-dir "/" ttf)))
+ (install-file ttf font-dir))
(find-files "." "\\.ttf$"))))))
(home-page "https://github.com/google/roboto")
(synopsis "The Roboto family of fonts")
--
GitLab