One extra bit :-) * The keymap was depending on the exported package grub, not on the one provided by the bootloader configuration, so e.g. systems that use grub-efi also ended up with grub in their dependency graph. This patch solves that issue.
>From ae2d83f91d522b5b0edfe1abbe88dec0a797235c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= <[email protected]> Date: Sun, 25 Oct 2020 10:13:46 +0100 Subject: [PATCH v3 4/5] system: Fix dependency for grub.cfg generation. * gnu/bootloader/grub.scm (eye-candy)[font-file]: Use the bootloader package provided with the configuration. --- gnu/bootloader/grub.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index b610ecbfe5..8636e9c690 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -191,9 +191,11 @@ fi~%" (symbol->string (assoc-ref colors 'bg))))) (define font-file - (normalize-file (file-append grub "/share/grub/unicode.pf2") - store-mount-point - store-directory-prefix)) + (let* ((bootloader (bootloader-configuration-bootloader config)) + (grub (bootloader-package bootloader))) + (normalize-file (file-append grub "/share/grub/unicode.pf2") + store-mount-point + store-directory-prefix))) (define image (normalize-file (grub-background-image config) -- 2.28.0
