diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-02-24 23:41:05 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-02-25 00:00:33 +0100 |
| commit | d00c2e9c2b75bc2c259947a56d1245d50d000e68 (patch) | |
| tree | 9ed1be5090358ebd06888f8f1f8158f44ae6e7b6 | |
| parent | b15658a60e83ab01df76825923c1404f53a840c2 (diff) | |
| download | guix-d00c2e9c2b75bc2c259947a56d1245d50d000e68.tar.gz guix-d00c2e9c2b75bc2c259947a56d1245d50d000e68.zip | |
services: console-font, kmscon: Refer to native 'font-gnu-unifont' builds.
Fixes a regression introduce in 01334a61c7541d8ae29c5252e2e5b3ed7a59c552
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'.
| -rw-r--r-- | gnu/services/base.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 35b03a877b..7ad1e765bd 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -824,7 +824,10 @@ host names." 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 @@ notably to select, copy, and paste text. The default options use the ;; 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)."))) |