From bde42f69dd7787f7b2a1a7b3c8c42bb87e0b7ce9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 22 Oct 2019 12:06:26 +0300 Subject: gn: web-font-awesome: Update for upstream Guix changes. * gn/packages/web.scm (web-font-awesome)[inherit]: New field, inherit from font-awesome. [arguments]: Rewrite for build-system and upstream changes. [version, source, build-system, native-inputs, home-page, synopsis, description, license]: Use inherited upstream values. --- gn/packages/web.scm | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/gn/packages/web.scm b/gn/packages/web.scm index ef2a86e..03fac11 100644 --- a/gn/packages/web.scm +++ b/gn/packages/web.scm @@ -2,6 +2,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages fonts) #:use-module (gnu packages python) #:use-module (gnu packages web) #:use-module (guix packages) @@ -212,38 +213,17 @@ connections and other data between hits and access to Apache internals.") (define-public web-font-awesome (package + (inherit font-awesome) (name "web-font-awesome") - (version "4.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://fontawesome.com/v" version - "/assets/font-awesome-" version ".zip")) - (sha256 - (base32 "0jgn26cr5xhqyxfwqmki0564cid4i4l38cwsddcslr3qkzpmhx2j")))) - (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (name "font-awesome") - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (targetdir (string-append out "/share/web/" name)) - (source (assoc-ref %build-inputs "source"))) - (invoke unzip source) - (copy-recursively (string-append "font-awesome-" ,version) - targetdir))))) - (native-inputs - `(("source" ,source) - ("unzip" ,unzip))) - (home-page "https://fontawesome.com/") - (synopsis "iconic font designed for use with Twitter Bootstrap") - (description "This font contains about 249 various icon glyphs. Glyphs are -designed as scalable vector graphics hence display very well at any screen size. -This font was basically designed to be used with the Twitter bootstrap library -but can be used in other places also.") - (license (list license:cc-by4.0 - license:silofl1.1)))) + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest (string-append out "/share/web/font-awesome"))) + (for-each + (lambda (dir) + (copy-recursively dir (string-append dest dir))) + '("css" "fonts" "less" "scss"))) + #t))))))) -- cgit v1.2.3