diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index f9ecceb226de..ff014dc0aa5a 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -253,6 +253,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}"; in { + mergedFirmware = "${prefix}.fd"; firmware = "${prefix}_CODE.fd"; variables = "${prefix}_VARS.fd"; variablesMs = diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix index ebeb8b98d4ca..f5d127c15796 100644 --- a/pkgs/build-support/xen/default.nix +++ b/pkgs/build-support/xen/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-qemu-traditional" "--with-system-qemu" (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios") - (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf") + (if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf") (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe") (enableFeature withFlask "xsmpolicy") ];