about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJon Seager <jon@sgrs.uk>2024-03-06 09:49:13 +0000
committerJon Seager <jon@sgrs.uk>2024-03-06 09:49:13 +0000
commit9e811a255eb34a240236399eeb3aef8efe31ecbd (patch)
tree53951dd6bdddd3e091137dbdc60d6985265c93fb
parentfb352eadbdb3bf0d95c9e5499cb5dbf0be8ff41a (diff)
multipass: revert change from OVMF.fd -> OVMF.firmware
-rw-r--r--pkgs/tools/virtualization/multipass/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix
index c746639e98eeb..e7875f00bb6a1 100644
--- a/pkgs/tools/virtualization/multipass/default.nix
+++ b/pkgs/tools/virtualization/multipass/default.nix
@@ -70,8 +70,8 @@ stdenv.mkDerivation
 
     # Patch the patch of the OVMF binaries to use paths from the nix store.
     substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
-      --replace "OVMF.fd" "${OVMF.firmware}" \
-      --replace "QEMU_EFI.fd" "${OVMF.firmware}"
+      --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
+      --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
 
     # Copy the grpc submodule we fetched into the source code.
     cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc
@@ -122,6 +122,7 @@ stdenv.mkDerivation
       dnsmasq
       iproute2
       iptables
+      OVMF.fd
       qemu
       qemu-utils
       xterm