summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Griffin <a@ajgrf.com>2017-05-31 13:01:42 -0500
committerDanny Milosavljevic <dannym@scratchpost.org>2017-05-31 23:24:41 +0200
commit046175cd4eae314f6e5d3d614efdeb573e8199df (patch)
treea3fd6e818114ba9770a4f0d53a732bfa956c44ce
parent203a9455c4695152fc5d0085bffeead9ce3216c2 (diff)
downloadguix-046175cd4eae314f6e5d3d614efdeb573e8199df.tar.gz
build: font: Support font collection files.
* guix/build/font-build-system.scm (install): Support TrueType
Collection (TTC) and OpenType Collection (OTC) files.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--guix/build/font-build-system.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index cca1e93f0f..f2a646f6f4 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,9 +51,9 @@ archive, or a font file."
          (source (getcwd))
          (fonts (string-append out "/share/fonts")))
     (for-each (cut install-file <> (string-append fonts "/truetype"))
-              (find-files source "\\.ttf$"))
+              (find-files source "\\.(ttf|ttc)$"))
     (for-each (cut install-file <> (string-append fonts "/opentype"))
-              (find-files source "\\.otf$"))
+              (find-files source "\\.(otf|otc)$"))
     #t))
 
 (define %standard-phases