From d0c126c4dff0c7d9da83a5c4dc64463a3c3859c1 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 13 Jan 2025 18:32:06 -0300
Subject: [PATCH] xen: use the merged OVMF blob

Fixes #373416

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/build-support/xen/default.nix | 53 ++++++++++++++++--------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix
index ebeb8b98d4cacd..2c80d8ab1d8eea 100644
--- a/pkgs/build-support/xen/default.nix
+++ b/pkgs/build-support/xen/default.nix
@@ -141,37 +141,40 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     python3Packages.setuptools
   ];
-  buildInputs = [
-    # Xen
-    acpica-tools
-    bzip2
-    dev86
-    e2fsprogs.dev
-    libnl
-    libuuid
-    lzo
-    ncurses
-    perl
-    python3Packages.python
-    xz
-    yajl
-    zlib
-    zstd
-
-    # oxenstored
-    ocamlPackages.findlib
-    ocamlPackages.ocaml
-
-    # Python Fixes
-    python3Packages.wrapPython
-  ] ++ optional withFlask checkpolicy ++ optional (versionOlder version "4.19") systemdMinimal;
+  buildInputs =
+    [
+      # Xen
+      acpica-tools
+      bzip2
+      dev86
+      e2fsprogs.dev
+      libnl
+      libuuid
+      lzo
+      ncurses
+      perl
+      python3Packages.python
+      xz
+      yajl
+      zlib
+      zstd
+
+      # oxenstored
+      ocamlPackages.findlib
+      ocamlPackages.ocaml
+
+      # Python Fixes
+      python3Packages.wrapPython
+    ]
+    ++ optional withFlask checkpolicy
+    ++ optional (versionOlder version "4.19") systemdMinimal;
 
   configureFlags = [
     "--enable-systemd"
     "--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")
   ];