diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
commit | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (patch) | |
tree | 0bc92edb753cfdf9a9e7ef763ebc19f0cd2d528c /gnu/packages/fonts.scm | |
parent | ad79ae7e2d7505292b11e87302b08f4db0f934e9 (diff) | |
parent | e5ad2cdf172eecc7edef37a500593b1941af013c (diff) | |
download | guix-patches-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar guix-patches-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/fonts.scm')
-rw-r--r-- | gnu/packages/fonts.scm | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 88315008bd..f77f9da163 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> -;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org> ;;; Copyright © 2018 Charlie Ritter <chewzerita@posteo.net> ;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com> @@ -1163,39 +1163,13 @@ itself.")))) (version "1.7") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "http://www.impallari.com/media/releases/dosis-" "v" version ".zip")) (sha256 (base32 "1qhci68f68mf87jd69vjf9qjq3wydgw1q7ivn3amjb65ls1s0c4s")))) - (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")) - (ttf-dir (string-append %output - "/share/fonts/truetype")) - (otf-dir (string-append %output - "/share/fonts/opentype"))) - (setenv "PATH" PATH) - (invoke "unzip" (assoc-ref %build-inputs "source")) - - (mkdir-p ttf-dir) - (mkdir-p otf-dir) - (for-each (lambda (ttf) - (install-file ttf ttf-dir)) - (find-files "." "\\.ttf$")) - (for-each (lambda (otf) - (install-file otf otf-dir)) - (find-files "." "\\.otf$")) - #t)))) - (native-inputs `(("unzip" ,unzip))) + (build-system font-build-system) (home-page "http://www.impallari.com/dosis") (synopsis "Very simple, rounded, sans serif family") (description |