diff options
| author | Danny Milosavljevic <dannym@friendly-machines.com> | 2026-02-16 23:16:47 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2026-03-13 14:58:19 +0900 |
| commit | 9d131cf9ce6655445c91fa5a8740b1fa72c36597 (patch) | |
| tree | 2e713da041b6430e6112fdadc017a80365b037a6 /gnu | |
| parent | 9a47c5f06ae2cc3b395c0e5312e06d958179771f (diff) | |
gnu: grub-efi32: Fix cross-compilation.
* gnu/packages/bootloaders.scm (grub-efi32)[arguments]<#:phases>
{patch-ovmf-path}: Modify.
Change-Id: I43c4854c08f9e932c91b8f895878a1c1a95146cd
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4e08cef31f9..d97c812a4c0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -523,35 +523,41 @@ menu to select one of the installed operating systems.") #$@(if (or (target-x86?) (target-arm?)) #~((replace 'patch-ovmf-path - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((arch #$(cond ((target-x86?) "ia32") ((target-arm?) "arm") (else "")))) (substitute* "tests/util/grub-shell.in" (("\\$\\{srcdir\\}/OVMF(32)?\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin"))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin"))) (("/usr/share/qemu/OVMF(32)?\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin"))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin"))) (("\\$\\{srcdir\\}/AAVMF(32)?\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin"))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin"))) (("/usr/share/qemu-efi-aarch64/QEMU_EFI\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin"))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin"))) (("/usr/share/AAVMF/AAVMF(32)?\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin"))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin"))) (("/usr/share/ovmf-arm/QEMU_EFI\\.fd") (search-input-file - inputs (string-append - "/share/firmware/ovmf_" arch ".bin")))))))) + (or native-inputs inputs) + (string-append + "/share/firmware/ovmf_" arch ".bin")))))))) #~()))))) (native-inputs (cond |