aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Griffin <a@ajgrf.com>2017-05-31 11:41:52 -0500
committerArun Isaac <arunisaac@systemreboot.net>2017-06-01 20:36:52 +0530
commitb963d8c2e549eeca2654e9e139f5835722a4ef9d (patch)
treee17749f431c073c7da97761ddeae7028431bb3d2
parenta5ce48c8f5e8b46438b25f670e8ba3ebb6fafa43 (diff)
downloadguix-b963d8c2e549eeca2654e9e139f5835722a4ef9d.tar
guix-b963d8c2e549eeca2654e9e139f5835722a4ef9d.tar.gz
gnu: font-comic-neue: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-comic-neue): Switch to 'font-build-system'. Re-indent. [source]: Use url-fetch/zipbomb. [native-inputs]: Remove dependency on unzip. Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
-rw-r--r--gnu/packages/fonts.scm54
1 files changed, 22 insertions, 32 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1145b3114f..6fe44d90d1 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1108,39 +1108,29 @@ later hand-tweaked with the gbdfed(1) editor:
(define-public font-comic-neue
(package
- (name "font-comic-neue")
- (version "2.3")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "http://www.comicneue.com/comic-neue-" version ".zip"))
- (sha256
- (base32
- "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
- (let ((font-dir (string-append %output
- "/share/fonts/truetype"))
- (source (assoc-ref %build-inputs "source"))
- (unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip")))
- (mkdir-p font-dir)
- (system* unzip source)
- (with-directory-excursion
- (string-append "Web")
- (for-each (lambda (ttf)
- (install-file ttf font-dir))
- (find-files "." "\\.ttf$")))))))
- (native-inputs `(("unzip" ,unzip)))
- (home-page "http://www.comicneue.com/")
- (synopsis "Font that fixes the shortcomings of Comic Sans")
- (description
- "Comic Neue is a font that attempts to create a respectable casual
+ (name "font-comic-neue")
+ (version "2.3")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append
+ "http://www.comicneue.com/comic-neue-" version ".zip"))
+ (sha256
+ (base32
+ "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk"))))
+ (build-system font-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'chdir
+ (lambda _
+ (chdir "Web")
+ #t)))))
+ (home-page "http://www.comicneue.com/")
+ (synopsis "Font that fixes the shortcomings of Comic Sans")
+ (description
+ "Comic Neue is a font that attempts to create a respectable casual
typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
- (license license:silofl1.1)))
+ (license license:silofl1.1)))
(define-public font-iosevka
(package