mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 06:06:53 -05:00
services: console-font, kmscon: Refer to native 'font-gnu-unifont' builds.
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:
parent
b15658a60e
commit
d00c2e9c2b
1 changed files with 5 additions and 2 deletions
|
@ -824,7 +824,10 @@ (define console-keymap-service-type
|
|||
of console keymaps with @command{loadkeys}.")))
|
||||
|
||||
(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"))
|
||||
|
||||
(define (console-font-shepherd-services tty+font)
|
||||
|
@ -2575,7 +2578,7 @@ (define kmscon-command
|
|||
;; TODO: Make this configurable.
|
||||
#:environment-variables
|
||||
(list (string-append "XDG_DATA_DIRS="
|
||||
#$font-gnu-unifont "/share"))))
|
||||
#+font-gnu-unifont "/share"))))
|
||||
(stop #~(make-kill-destructor)))))
|
||||
(description "Start the @command{kmscon} virtual terminal emulator for the
|
||||
Linux @dfn{kernel mode setting} (KMS).")))
|
||||
|
|
Loading…
Reference in a new issue