From 070ca2f0937a1110a5e96bff38f2a87da3a11765 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 8 Aug 2017 12:24:08 +0000 Subject: [PATCH] gnu: font-google-noto: Use 'font-build-system'. * gnu/packages/fonts.scm (font-google-noto): Switch to font-build-system. (source): Use 'url-fetch/zipbomb'. (arguments): Remove it. (native-inputs): Remove it. --- gnu/packages/fonts.scm | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e421b2c6a..958658241 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 -- 2.14.0