From patchwork Thu Sep 22 01:20:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Taiju HIGASHI X-Patchwork-Id: 42822 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8A4EA27BBEE; Thu, 22 Sep 2022 02:22:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DBF0827BBEA for ; Thu, 22 Sep 2022 02:22:11 +0100 (BST) Received: from localhost ([::1]:42150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obAup-0000NB-1o for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 21:22:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obAuh-0000N3-46 for guix-patches@gnu.org; Wed, 21 Sep 2022 21:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obAug-0003Kb-S9 for guix-patches@gnu.org; Wed, 21 Sep 2022 21:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obAug-0005Fm-CB for guix-patches@gnu.org; Wed, 21 Sep 2022 21:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57963] [PATCH v2] home: fontutils: Support user's fontconfig. References: <20220921002721.23511-1-higashi@taiju.info> In-Reply-To: <20220921002721.23511-1-higashi@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 01:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57963@debbugs.gnu.org Cc: Taiju HIGASHI Received: via spool by 57963-submit@debbugs.gnu.org id=B57963.166380966820134 (code B ref 57963); Thu, 22 Sep 2022 01:22:02 +0000 Received: (at 57963) by debbugs.gnu.org; 22 Sep 2022 01:21:08 +0000 Received: from localhost ([127.0.0.1]:35508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obAto-0005Eg-4Q for submit@debbugs.gnu.org; Wed, 21 Sep 2022 21:21:08 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:46064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obAti-0005Dn-Nf for 57963@debbugs.gnu.org; Wed, 21 Sep 2022 21:21:06 -0400 Received: by mail-pj1-f52.google.com with SMTP id p1-20020a17090a2d8100b0020040a3f75eso570471pjd.4 for <57963@debbugs.gnu.org>; Wed, 21 Sep 2022 18:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=rIL9alDk/h4IHhW6O2PK1plbXPTTrfvcaPUJzEtmTxE=; b=sPqkBmdQooAoaz44YMlb0kShyyS2EwkZzcqoxu7ERsW4wcTJOl41SA65WUc6mwcdKz Wdz7olrgs0Yn8P0bgWPTkExH5K4T/oztR7C5i2y/J2pTCXY7DF98Z/YQ2cNoVu5cKJq4 R2WVZkcQWPBeGdfigjgU9Ym3ypz5WJgBpeU/2FMv3Kh5w5RZiqogXL4H4qqjZCnc+IAB vcTIwmcyihNnjrGmJ/KH5tk0rb5HWpbMUF8Vf+UDgStuuDpOHWh8sga/zOcalHKujZx2 iquntOs/qtBAlG6rZpkBXWNDkwIf8ZVlbpAfCHbeC7vVhfdVdODw3j1tlnGG/AAnzj1H Wwtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=rIL9alDk/h4IHhW6O2PK1plbXPTTrfvcaPUJzEtmTxE=; b=D3/3MjmdfWL/5g98WVg5qZTjuy9BbrBs9mWVBWBCw4NgFFWXD/yaglsmogei2GDme9 KJf8Z5345Qai6K5eESyOmUXz9bWc9dULgsb1TyJXFQQuepM4JjthsY41zemdwtmI+jvY Ttk4lqlzT0vPSaUrUIH9U9E7XK1tzKesqQmx0fsMo+MAuHc9JM3z95F6sun4vuawJruA 088jdexnoUEPe3Gd2EXfFb8VaO/5gW3MWwqMUq/3gckUUIhqZJgT1Pqz/zd/yoUoBPpB hOwVf5hW/JepQntKJk4m9tS2KsyAOfivcNRW3RWI5K6eZzalZbHuHDQfXQYqtjJzy8dB V6XQ== X-Gm-Message-State: ACrzQf0MUy7pdyhFQDtyMs1/JVVzGIJQEchWjj76Dj/50twz0kApCZES R4Xmw4fGGMUljAi5JaxbDxxTx0t+L9ktWBgf X-Google-Smtp-Source: AMsMyM5m1XlloRtra3Ivs3sUkakaUq4wqcUhUSHHWDdjOB81uKARIDau5tAPjaI3G9TkH09gD+j2Jg== X-Received: by 2002:a17:902:b415:b0:178:2835:29e7 with SMTP id x21-20020a170902b41500b00178283529e7mr936781plr.86.1663809656469; Wed, 21 Sep 2022 18:20:56 -0700 (PDT) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id d18-20020a170902ced200b001783f964fe3sm2660325plg.113.2022.09.21.18.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 18:20:55 -0700 (PDT) From: Taiju HIGASHI Date: Thu, 22 Sep 2022 10:20:33 +0900 Message-Id: <20220922012033.30835-1-higashi@taiju.info> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/home/services/fontutils.scm (add-fontconfig-config-file): Support user's fontconfig. --- gnu/home/services/fontutils.scm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/gnu/home/services/fontutils.scm b/gnu/home/services/fontutils.scm index 6062eaed6a..b57cccbaae 100644 --- a/gnu/home/services/fontutils.scm +++ b/gnu/home/services/fontutils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2022 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,9 @@ (define-module (gnu home services fontutils) #:use-module (gnu home services) #:use-module (gnu packages fontutils) #:use-module (guix gexp) + #:use-module (srfi srfi-1) + #:use-module (sxml simple) + #:use-module (ice-9 match) #:export (home-fontconfig-service-type)) @@ -33,15 +37,28 @@ (define-module (gnu home services fontutils) ;;; ;;; Code: -(define (add-fontconfig-config-file he-symlink-path) +(define (parse-extra-user-config extra-user-config) + (map (match-lambda + ((? pair? sxml) sxml) + ((? string? xml) (xml->sxml xml)) + (_ (error "extra-user-config must be xml string or sxml."))) + extra-user-config)) + +(define (add-fontconfig-config-file extra-user-config) `(("fontconfig/fonts.conf" ,(mixed-text-file "fonts.conf" " - - ~/.guix-home/profile/share/fonts -")))) +" + (call-with-output-string + (lambda (port) + (sxml->xml + `(fontconfig + (dir "~/.guix-home/profile/share/fonts") + ,@(parse-extra-user-config extra-user-config)) + port) + (newline port))))))) (define (regenerate-font-cache-gexp _) `(("profile/share/fonts" @@ -49,6 +66,8 @@ (define (regenerate-font-cache-gexp _) (define home-fontconfig-service-type (service-type (name 'home-fontconfig) + (compose concatenate) + (extend append) (extensions (list (service-extension home-xdg-configuration-files-service-type @@ -59,7 +78,7 @@ (define home-fontconfig-service-type (service-extension home-profile-service-type (const (list fontconfig))))) - (default-value #f) + (default-value '()) (description "Provides configuration file for fontconfig and make fc-* utilities aware of font packages installed in Guix Home's profile.")))