summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/bootloaders.scm22
1 files changed, 13 insertions, 9 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index ea5400b5b59..c6315805e63 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -446,7 +446,7 @@ menu to select one of the installed operating systems.")
446 #~(modify-phases #$phases 446 #~(modify-phases #$phases
447 #$@(if (this-package-native-input "qemu-minimal") 447 #$@(if (this-package-native-input "qemu-minimal")
448 #~((add-after 'patch-stuff 'patch-ovmf-path 448 #~((add-after 'patch-stuff 'patch-ovmf-path
449 (lambda* (#:key inputs #:allow-other-keys) 449 (lambda* (#:key native-inputs inputs #:allow-other-keys)
450 (let ((arch #$(cond ((target-x86-64?) "x64") 450 (let ((arch #$(cond ((target-x86-64?) "x64")
451 ((target-x86-32?) "ia32") 451 ((target-x86-32?) "ia32")
452 ((target-aarch64?) "aarch64") 452 ((target-aarch64?) "aarch64")
@@ -455,20 +455,24 @@ menu to select one of the installed operating systems.")
455 (substitute* "tests/util/grub-shell.in" 455 (substitute* "tests/util/grub-shell.in"
456 (("OVMF-ia32\\.fd") 456 (("OVMF-ia32\\.fd")
457 (search-input-file 457 (search-input-file
458 inputs (string-append 458 (or native-inputs inputs)
459 "/share/firmware/ovmf_" arch ".bin"))) 459 (string-append
460 "/share/firmware/ovmf_" arch ".bin")))
460 (("OVMF\\.fd") 461 (("OVMF\\.fd")
461 (search-input-file 462 (search-input-file
462 inputs (string-append 463 (or native-inputs inputs)
463 "/share/firmware/ovmf_" arch ".bin"))) 464 (string-append
465 "/share/firmware/ovmf_" arch ".bin")))
464 (("/usr/share/qemu-efi/QEMU_EFI\\.fd") 466 (("/usr/share/qemu-efi/QEMU_EFI\\.fd")
465 (search-input-file 467 (search-input-file
466 inputs (string-append 468 (or native-inputs inputs)
467 "/share/firmware/ovmf_" arch ".bin"))) 469 (string-append
470 "/share/firmware/ovmf_" arch ".bin")))
468 (("/usr/share/ovmf-arm/QEMU_EFI\\.fd") 471 (("/usr/share/ovmf-arm/QEMU_EFI\\.fd")
469 (search-input-file 472 (search-input-file
470 inputs (string-append 473 (or native-inputs inputs)
471 "/share/firmware/ovmf_" arch ".bin")))))))) 474 (string-append
475 "/share/firmware/ovmf_" arch ".bin"))))))))
472 #~()) 476 #~())
473 (add-after 'patch-stuff 'use-absolute-efibootmgr-path 477 (add-after 'patch-stuff 'use-absolute-efibootmgr-path
474 (lambda* (#:key inputs #:allow-other-keys) 478 (lambda* (#:key inputs #:allow-other-keys)