aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-05-15 16:01:20 +0200
committerLudovic Courtès <ludo@gnu.org>2020-05-16 00:34:40 +0200
commit8cf7dd24ab035ee6a9d2a4f667ba139f888639e5 (patch)
tree743552d01fa28c484875e6493537c825a0b12149 /gnu
parenta7b20226b2bf1a73b8f0f6536e7fa43326f35e33 (diff)
downloadguix-8cf7dd24ab035ee6a9d2a4f667ba139f888639e5.tar
guix-8cf7dd24ab035ee6a9d2a4f667ba139f888639e5.tar.gz
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'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/bootloader/grub.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 3f61b4a963..8c5b5eac0c 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))))