ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 committed by Tobias Geerinckx-Rice
parent 6296e0c0f1
commit a8b8ca6fd3
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
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 @@ (define (setup-gfxterm config font-file)
(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 @@ (define builder
;; '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))))