[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: bootloader: grub: Refer to the native 'grub-mklayout' and font fi
From: |
guix-commits |
Subject: |
01/07: bootloader: grub: Refer to the native 'grub-mklayout' and font file. |
Date: |
Fri, 15 May 2020 18:34:52 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8cf7dd24ab035ee6a9d2a4f667ba139f888639e5
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))))
- branch master updated (a7b2022 -> 408ae72), guix-commits, 2020/05/15
- 01/07: bootloader: grub: Refer to the native 'grub-mklayout' and font file.,
guix-commits <=
- 03/07: gexp: Add 'let-system'., guix-commits, 2020/05/15
- 04/07: utils: 'target-arm32?' & co. take an optional parameter., guix-commits, 2020/05/15
- 07/07: services: shepherd: Silence Guile warnings., guix-commits, 2020/05/15
- 06/07: linux-initrd: Silence Guile warnings., guix-commits, 2020/05/15
- 05/07: vm: Use 'let-system'., guix-commits, 2020/05/15
- 02/07: gexp: Compilers can now return lowerable objects., guix-commits, 2020/05/15