diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-02-05 11:35:21 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-02-07 18:51:14 +0100 |
| commit | 4dcb3db0eebf50b85bfafbcea438ff5e29d4b89f (patch) | |
| tree | 6bb2e9c2ef7ec1d5a45363f3c341424e36100a35 | |
| parent | 33a8687a2a465efd516e3a3fb742fd0e1aa49f05 (diff) | |
| download | guix-4dcb3db0eebf50b85bfafbcea438ff5e29d4b89f.tar guix-4dcb3db0eebf50b85bfafbcea438ff5e29d4b89f.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/fonts.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1f6d1d0c36..43991d1034 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -525,13 +525,11 @@ ko (Korean) locales for @code{fontconfig}.") (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 @@ display all Unicode symbols.") (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") |