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

[guix-commits]

nckx pushed a commit to branch core-updates
in repository guix.

commit a8b8ca6fd32f308e9b73acbf537319cbb2246cf1
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri May 15 16:01:20 2020 +0200

    bootloader: grub: Refer to the native 'grub-mklayout' and font file.
    
    * gnu/bootloader/grub.scm (eye-candy): Refer to the native FONT-FILE.
    (keyboard-layout-file): Refer to the native 'grub-mklayout'.
---
 gnu/bootloader/grub.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 3f61b4a..8c5b5ea 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -176,7 +176,7 @@ system string---e.g., \"x86_64-linux\"."
     (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
         #~(format #f "if loadfont ~a; then
   setup_gfxterm
-fi~%" #$font-file)
+fi~%" #+font-file)
         ""))
 
   (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'
           ;; (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)
                   "-o" #$output))))