Unverified Commit 37b92081 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

OVMF: add `passthru.mergedFirmware` parameter; xen: use the merged OVMF blob (#373560)

parents 010f694c a35e5e53

pkgs/applications/virtualization/OVMF/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 =

pkgs/build-support/xen/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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")

  ];