From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 2/3] profiles: Add fonts-dir-file hook.
Date: Fri, 1 Jul 2016 12:27:29 +0300 [thread overview]
Message-ID: <20160701092730.2265-3-alezost@gmail.com> (raw)
In-Reply-To: <20160701092730.2265-1-alezost@gmail.com>
* guix/profiles.scm (fonts-dir-file): New procedure.
(%default-profile-hooks): Add it.
---
guix/profiles.scm | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 90c4332..945da62 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;;
@@ -756,10 +756,51 @@ entries. It's used to query the MIME type of a given file."
#:substitutable? #f)
(return #f))))
+(define (fonts-dir-file manifest)
+ "Return a derivation that builds the @file{fonts.dir} and @file{fonts.scale}
+files for the truetype fonts of the @var{manifest} entries."
+ (define mkfontscale
+ (module-ref (resolve-interface '(gnu packages xorg)) 'mkfontscale))
+
+ (define mkfontdir
+ (module-ref (resolve-interface '(gnu packages xorg)) 'mkfontdir))
+
+ (define build
+ #~(begin
+ (use-modules (srfi srfi-26)
+ (guix build utils)
+ (guix build union))
+ (let ((ttf-dirs (filter file-exists?
+ (map (cut string-append <>
+ "/share/fonts/truetype")
+ '#$(manifest-inputs manifest)))))
+ (mkdir #$output)
+ (if (null? ttf-dirs)
+ (exit #t)
+ (let* ((fonts-dir (string-append #$output "/share/fonts"))
+ (ttf-dir (string-append fonts-dir "/truetype"))
+ (mkfontscale (string-append #+mkfontscale
+ "/bin/mkfontscale"))
+ (mkfontdir (string-append #+mkfontdir
+ "/bin/mkfontdir")))
+ (mkdir-p fonts-dir)
+ (union-build ttf-dir ttf-dirs
+ #:log-port (%make-void-port "w"))
+ (with-directory-excursion ttf-dir
+ (exit (and (zero? (system* mkfontscale))
+ (zero? (system* mkfontdir))))))))))
+
+ (gexp->derivation "fonts-dir-file" build
+ #:modules '((guix build utils)
+ (guix build union))
+ #:local-build? #t
+ #:substitutable? #f))
+
(define %default-profile-hooks
;; This is the list of derivation-returning procedures that are called by
;; default when making a non-empty profile.
(list info-dir-file
+ fonts-dir-file
ghc-package-cache-file
ca-certificate-bundle
gtk-icon-themes
--
2.8.3
next prev parent reply other threads:[~2016-07-01 9:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 9:27 [PATCH 0/3] Generate "<profile>/share/fonts/truetype/fonts.dir" file Alex Kost
2016-07-01 9:27 ` [PATCH 1/3] gnu: mkfontdir: Do not propagate 'mkfontscale' Alex Kost
2016-07-02 14:26 ` Ludovic Courtès
2016-07-01 9:27 ` Alex Kost [this message]
2016-07-02 14:34 ` [PATCH 2/3] profiles: Add fonts-dir-file hook Ludovic Courtès
2016-07-02 19:19 ` Alex Kost
2016-07-05 14:31 ` Ludovic Courtès
2016-07-06 19:41 ` Alex Kost
2016-07-22 6:59 ` Alex Kost
2016-07-24 17:09 ` Ludovic Courtès
2016-07-25 14:26 ` Alex Kost
2016-07-01 9:27 ` [PATCH 3/3] doc: Describe how to make X server find TrueType fonts Alex Kost
2016-07-02 14:38 ` Ludovic Courtès
2016-07-02 19:22 ` Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160701092730.2265-3-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.