mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: console-font, kmscon: Refer to native 'font-gnu-unifont' builds.

Browse source 
Fixes a regression introduce in 01334a61c7
that would prevent system cross-compilation (with "guix system image
--target=...") due to 'font-gnu-unifont' depending on 'perl-gd', which
currently cannot be cross-compiled.

* gnu/services/base.scm (%default-console-font, kmscon-service-type):
Refer to 'font-gnu-unifont' with 'ungexp-native'.
This commit is contained in:
Ludovic Courtès 2023-02-24 23:41:05 +01:00
parent b15658a60e
commit d00c2e9c2b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/services/base.scm
View file

@ -824,7 +824,10 @@ (define console-keymap-service-type
of console keymaps with @command{loadkeys}."))) of console keymaps with @command{loadkeys}.")))
(define %default-console-font (define %default-console-font
#~(string-append #$font-gnu-unifont:psf ;; Note: the 'font-gnu-unifont' package cannot be cross-compiled (yet), but
;; its "psf" output is the same whether it's built natively or not, hence
;; 'ungexp-native'.
#~(string-append #+font-gnu-unifont:psf
"/share/consolefonts/Unifont-APL8x16.psf.gz")) "/share/consolefonts/Unifont-APL8x16.psf.gz"))
(define (console-font-shepherd-services tty+font) (define (console-font-shepherd-services tty+font)
@ -2575,7 +2578,7 @@ (define kmscon-command
;; TODO: Make this configurable. ;; TODO: Make this configurable.
#:environment-variables #:environment-variables
(list (string-append "XDG_DATA_DIRS=" (list (string-append "XDG_DATA_DIRS="
#$font-gnu-unifont "/share")))) #+font-gnu-unifont "/share"))))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))
(description "Start the @command{kmscon} virtual terminal emulator for the (description "Start the @command{kmscon} virtual terminal emulator for the
Linux @dfn{kernel mode setting} (KMS)."))) Linux @dfn{kernel mode setting} (KMS).")))