~ruther/guix-local: gnu: fonts: Use install-file where appropriate.

4dcb3db0eebf50b85bfafbcea438ff5e29d4b89f — Tobias Geerinckx-Rice 9 years ago 33a8687

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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 7 deletions(-)

M gnu/packages/fonts.scm

M gnu/packages/fonts.scm => gnu/packages/fonts.scm +4 -7

@@ 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")