From 3af6b0c8259c914136e839d12ab3332a1b9a87ec Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 31 May 2017 12:16:01 -0500 Subject: [PATCH 1/2] build: font: Support TrueType Collection files. * guix/build/font-build-system.scm (install): Support TrueType Collection (TTC) files. Only use one for-each loop to search for files. --- guix/build/font-build-system.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm index cca1e93f0..326957921 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 +;;; Copyright © 2017 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,9 +51,7 @@ 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$")) - (for-each (cut install-file <> (string-append fonts "/opentype")) - (find-files source "\\.otf$")) + (find-files source "\\.(ttf|ttc|otf)$")) #t)) (define %standard-phases -- 2.13.0