summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac <arunisaac@systemreboot.net>2019-01-15 15:24:16 +0530
committerArun Isaac <arunisaac@systemreboot.net>2019-01-15 15:27:54 +0530
commit6aa4f09eb6b94ef582fcea0d42dfdd2b0146d07b (patch)
treed0bb4de4258c4024782c0492eff043c655c44fcc
parent4deeb1ed067ff572e775eb2977cfbbd7411ee67a (diff)
downloadpatches-6aa4f09eb6b94ef582fcea0d42dfdd2b0146d07b.tar
patches-6aa4f09eb6b94ef582fcea0d42dfdd2b0146d07b.tar.gz
gnu: font-dosis: Switch to font-build-system.
* gnu/packages/fonts.scm (font-dosis): Switch to font-build-system. [source]: Use url-fetch/zipbomb. [native-inputs]: Remove unzip.
-rw-r--r--gnu/packages/fonts.scm32
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