futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootloader: grub: Refer to the native 'grub-mklayout' and font file.

Browse Source 
* gnu/bootloader/grub.scm (eye-candy): Refer to the native FONT-FILE.
(keyboard-layout-file): Refer to the native 'grub-mklayout'.
This commit is contained in:
Ludovic Courtès 2020-05-15 16:01:20 +02:00
parent a7b20226b2
commit 8cf7dd24ab
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/bootloader/grub.scm
View File

@ -176,7 +176,7 @@ system string---e.g., \"x86_64-linux\"."
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
#~(format #f "if loadfont ~a; then #~(format #f "if loadfont ~a; then
setup_gfxterm setup_gfxterm
fi~%" #$font-file) fi~%" #+font-file)
"")) ""))
(define (theme-colors type) (define (theme-colors type)
@ -237,7 +237,7 @@ the 'share/X11/xkb/symbols/' directory of 'xkeyboard-config'."
;; 'grub-kbdcomp' passes all its arguments but '-o' to 'ckbcomp' ;; 'grub-kbdcomp' passes all its arguments but '-o' to 'ckbcomp'
;; (from the 'console-setup' package). ;; (from the 'console-setup' package).
(invoke #$(file-append grub "/bin/grub-mklayout") (invoke #+(file-append grub "/bin/grub-mklayout")
"-i" #+(keyboard-layout->console-keymap layout) "-i" #+(keyboard-layout->console-keymap layout)
"-o" #$output)))) "-o" #$output))))