From fee051c6fcf85b7ff736fd9c37bd9e85797672be Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:31:09 +0100
Subject: [PATCH] packages.OVMF-SNP: patch missing git submodule

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 packages/by-name/OVMF-SNP/package.nix | 31 ++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/by-name/OVMF-SNP/package.nix b/packages/by-name/OVMF-SNP/package.nix
index ccb8abe070..2ede55cc34 100644
--- a/packages/by-name/OVMF-SNP/package.nix
+++ b/packages/by-name/OVMF-SNP/package.nix
@@ -6,18 +6,33 @@
   fetchFromGitHub,
   nasm,
   acpica-tools,
+  fetchpatch2,
+  applyPatches,
 }:
 
-edk2.mkDerivation "OvmfPkg/AmdSev/AmdSevX64.dsc" rec {
+edk2.mkDerivation "OvmfPkg/AmdSev/AmdSevX64.dsc" {
   name = "OVMF-SNP";
-  src = fetchFromGitHub {
-    owner = "amdese";
-    repo = "ovmf";
-    # https://github.com/AMDESE/ovmf/tree/apic-mmio-fix4
-    rev = "64b3116ed087f8cb026201e56e42efe751e2cf7d";
-    fetchSubmodules = true;
-    hash = "sha256-nb4p01Y+M5a3EEJb9692hcFkU7HgpbG1rZa60T+I8N4=";
+
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "amdese";
+      repo = "ovmf";
+      # https://github.com/AMDESE/ovmf/tree/apic-mmio-fix4
+      rev = "64b3116ed087f8cb026201e56e42efe751e2cf7d";
+      fetchSubmodules = true;
+      hash = "sha256-nb4p01Y+M5a3EEJb9692hcFkU7HgpbG1rZa60T+I8N4=";
+    };
+
+    patches = [
+      # UnitTestFrameworkPkg: Use TianoCore mirror of subhook submodule
+      # https://github.com/tianocore/edk2/pull/6402
+      (fetchpatch2 {
+        url = "https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701.patch";
+        hash = "sha256-7xGc1jM90Z3Uv/3QZCqry2EHQRV0nokqL1sfG6k2WS8=";
+      })
+    ];
   };
+
   postPatch = ''
     touch OvmfPkg/AmdSev/Grub/grub.efi
   '';