~ruther/guix-local: gnu: grub-efi: Fix cross-compiling.

adf81712ad5a08238b4035cbd6753fb8235cdc38 — Efraim Flashner 8 months ago aed33e0

gnu: grub-efi: Fix cross-compiling.

* gnu/packages/bootloaders.scm (grub-efi)[arguments]: Adjust the
'patch-ovmf-path phase to also check the native-inputs.

Change-Id: I5f547821480d3d6c9d46e6c9f35d7dad6d3c6e89

patch browse .tar.gz

1 files changed, 13 insertions(+), 9 deletions(-)

M gnu/packages/bootloaders.scm

M gnu/packages/bootloaders.scm => gnu/packages/bootloaders.scm +13 -9

@@ 446,7 446,7 @@ menu to select one of the installed operating systems.")
         #~(modify-phases #$phases
             #$@(if (this-package-native-input "qemu-minimal")
                    #~((add-after 'patch-stuff 'patch-ovmf-path
-                        (lambda* (#:key inputs #:allow-other-keys)
+                        (lambda* (#:key native-inputs inputs #:allow-other-keys)
                           (let ((arch #$(cond ((target-x86-64?) "x64")
                                               ((target-x86-32?) "ia32")
                                               ((target-aarch64?) "aarch64")


@@ 455,20 455,24 @@ menu to select one of the installed operating systems.")
                             (substitute* "tests/util/grub-shell.in"
                               (("OVMF-ia32\\.fd")
                                (search-input-file
-                                 inputs (string-append
-                                          "/share/firmware/ovmf_" arch ".bin")))
+                                 (or native-inputs inputs)
+                                 (string-append
+                                   "/share/firmware/ovmf_" arch ".bin")))
                               (("OVMF\\.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/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/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"))))))))
                    #~())
             (add-after 'patch-stuff 'use-absolute-efibootmgr-path
               (lambda* (#:key inputs #:allow-other-keys)