From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 2CC631DD57; Sat, 08 Feb 2025 13:37:13 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 8D3C51DD4A; Sat, 08 Feb 2025 13:37:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: **** X-Spam-Status: No, score=4.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FROM_SUSPICIOUS_NTLD,FROM_SUSPICIOUS_NTLD_FP, PDS_OTHER_BAD_TLD,RDNS_NONE,SPF_HELO_NONE autolearn=no autolearn_force=no version=4.0.1 Received: from kurisu.lahfa.xyz (unknown [IPv6:2001:bc8:38ee::1]) by atuin.qyliss.net (Postfix) with ESMTPS id 530801DD49 for ; Sat, 08 Feb 2025 13:37:01 +0000 (UTC) From: Samy Lahfa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lahfa.xyz; s=kurisu; t=1739021817; bh=TQVss/HXpKLsb1Te3Kl0odprILgc1p7cWckNOj8Q97k=; h=From:To:Cc:Subject:Date; b=NqBMexgDTppPzX1NLa8T+WABKO42803vUUmE2d1IySgOvwjlzEvaGz4tjzZm5xn1b ZZgP5SKrcJIqaOL4qrC4szisYQ2FHxEDPhkx97XGmJGYzzlmcIqRaoYsqF49tMvs9a c481yj3mDj8Z+Hcz0DDfbFUy/6cJc2BiaXqBNGNA= To: devel@spectrum-os.org Subject: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file Date: Sat, 8 Feb 2025 14:36:11 +0100 Message-ID: <20250208133634.1963410-1-samy+spectrum@lahfa.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HWQEAF5JBM4WNW2AJ4KYA2DID65CR7BK X-Message-ID-Hash: HWQEAF5JBM4WNW2AJ4KYA2DID65CR7BK X-MailFrom: samy+spectrum@lahfa.xyz X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: shymega@shymega.org.uk, Samy Lahfa X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Samy Lahfa --- This fixes the foot terminal app-vm by adding dejavu_fonts package to the nix store as well as adding the fontconfig file, so it knows which default font to use. img/app/Makefile | 2 ++ img/app/default.nix | 3 ++- img/app/etc/fonts/fonts.conf | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 img/app/etc/fonts/fonts.conf diff --git a/img/app/Makefile b/img/app/Makefile index 7887aa8..eeb17fa 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -30,6 +30,7 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-fie VM_FILES = \ etc/dbus-1/session.conf \ + etc/fonts/fonts.conf \ etc/fstab \ etc/init \ etc/mdev.conf \ @@ -52,6 +53,7 @@ VM_FILES = \ etc/s6-linux-init/scripts/rc.shutdown \ etc/s6-linux-init/scripts/rc.shutdown.final \ etc/xdg/xdg-desktop-portal/portals.conf + VM_DIRS = dev run proc sys tmp \ etc/s6-linux-init/run-image/service VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo diff --git a/img/app/default.nix b/img/app/default.nix index 6537fb2..5b58a5f 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -8,7 +8,7 @@ pkgsStatic.callPackage ( { lib, stdenvNoCC, runCommand, writeClosure , erofs-utils, jq, s6-rc, util-linux , busybox, cacert, execline, kmod, linux_latest, mdevd, s6, s6-linux-init -, xdg-desktop-portal-spectrum +, xdg-desktop-portal-spectrum, dejavu_fonts, }: let @@ -37,6 +37,7 @@ let s6-rc terminfo xdg-desktop-portal-spectrum + dejavu_fonts # Some packages can't (currently?) be built statically. diff --git a/img/app/etc/fonts/fonts.conf b/img/app/etc/fonts/fonts.conf new file mode 100644 index 0000000..0dcde54 --- /dev/null +++ b/img/app/etc/fonts/fonts.conf @@ -0,0 +1,21 @@ + + + + + + + monospace + + DejaVu Sans Mono + + + + + sans-serif + + DejaVu Sans + + + + /usr/share/fonts + -- 2.47.2