summary refs log tree commit diff
diff options
context:
space:
mode:
authorng0 <ng0@infotropique.org>2017-08-08 12:37:27 +0000
committerRicardo Wurmus <rekado@elephly.net>2017-08-16 16:18:50 +0200
commit2f7966c8e28c352c0fffc5ec3fda394a67d7d2d1 (patch)
tree3b97b000aa510adc6da15e1f3b8bfe8a1ffd5232
parentd534f3a4d3e444ad38e3f7e4f26e69abbdbea337 (diff)
downloadguix-2f7966c8e28c352c0fffc5ec3fda394a67d7d2d1.tar.gz
gnu: font-google-noto: Use font-build-system.
* gnu/packages/fonts.scm (font-google-noto)[build-system]: Use
font-build-system.
[source]: Use url-fetch/zipbomb.
[arguments]: Remove it.
[native-inputs]: Remove it.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
-rw-r--r--gnu/packages/fonts.scm27
1 files changed, 3 insertions, 24 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index b01d39c7e2..a83be8522c 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -622,35 +622,14 @@ utilities to ease adding new glyphs to the font.")
     (name "font-google-noto")
     (version "20170403")
     (source (origin
-              (method url-fetch)
+              (method url-fetch/zipbomb)
               (uri (string-append "https://noto-website.storage.googleapis.com/"
                                   "pkgs/Noto-hinted.zip"))
+              (file-name (string-append name "-" version ".zip"))
               (sha256
                (base32
                 "1p92a6dvs7wqwjfpp1ahr9z1wz35am0l8r78521383spd77bmrfm"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils)
-                                (srfi srfi-26))
-
-                   (let ((PATH     (string-append (assoc-ref %build-inputs
-                                                             "unzip")
-                                                  "/bin"))
-                         (font-dir (string-append %output
-                                                  "/share/fonts/truetype")))
-                     (setenv "PATH" PATH)
-                     (system* "unzip" (assoc-ref %build-inputs "source"))
-
-                     (mkdir-p font-dir)
-                     (for-each (lambda (ttf)
-                                 (install-file ttf font-dir))
-                               (find-files "." "\\.ttf$"))
-                     (for-each (lambda (otf)
-                                 (install-file otf font-dir))
-                               (find-files "." "\\.otf$"))))))
-    (native-inputs `(("unzip" ,unzip)))
+    (build-system font-build-system)
     (home-page "https://www.google.com/get/noto/")
     (synopsis "Fonts to cover all languages")
     (description "Google Noto Fonts is a family of fonts designed to support