From 956ff3141a7eb17c2fa84706ac8430897013f8a2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 9 Apr 2022 00:07:15 +0530 Subject: manifest.scm: Add font-charter and font-fira-code. * manifest.scm: Import (gnu packages fonts) and (guix utils). (font-charter, font-fira-code): New variables. Add font-charter and font-fira-code to manifest. --- manifest.scm | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/manifest.scm b/manifest.scm index 78a9fe5..d931833 100644 --- a/manifest.scm +++ b/manifest.scm @@ -18,11 +18,49 @@ ;;; . (use-modules (gnu packages autotools) + ((gnu packages fonts) #:prefix guix:) (gnu packages gettext) (gnu packages guile) ((gnu packages skribilo) #:prefix guix:) (guix git-download) - (guix packages)) + (guix packages) + (guix utils)) + +;; Install web fonts in font-charter and font-fira-code. There is a +;; pending patchset https://issues.guix.gnu.org/54471 to do this in +;; upstream Guix. Use the upstream Guix packages once that patchset +;; lands in the upstream master branch. + +(define font-charter + (package + (inherit guix:font-charter) + (outputs '("out")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-web-fonts + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (source (getcwd)) + (fonts (string-append out "/share/fonts"))) + (for-each (lambda (file) + (install-file file (string-append fonts "/web"))) + (find-files source "\\.(woff|woff2)$")))))))))) + +(define font-fira-code + (package + (inherit guix:font-fira-code) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-web-fonts + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (source (getcwd)) + (fonts (string-append out "/share/fonts"))) + (for-each (lambda (file) + (install-file file (string-append fonts "/web"))) + (find-files source "\\.(woff|woff2)$")))))))))) ;; Use a later unreleased version of skribilo since we need certain ;; improvements and bug fixes from it. @@ -49,4 +87,4 @@ ,@(package-native-inputs guix:skribilo)))))) (packages->manifest - (list guile-3.0 skribilo)) + (list font-charter font-fira-code guile-3.0 skribilo)) -- cgit v1.2.3