From 88a1349dfe606be461057b553087eb6b787b4118 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Feb 2024 08:27:37 -0500
Subject: [PATCH] OVMF: Enable bundling the MS secure boot variables on
 aarch64.

---
 pkgs/applications/virtualization/OVMF/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 11f8c3037584..cff31a759a2b 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -45,6 +45,10 @@ let
     aarch64 = {
       projectDscPath = "ArmVirtPkg/ArmVirtQemu.dsc";
       fwPrefix = "AAVMF";
+      msVarsArgs = {
+        flavor = "AAVMF";
+        archDir = "AARCH64";
+      };
     };
     riscv64 = {
       projectDscPath = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef46c7bc1929..e76c96f82be1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26904,7 +26904,7 @@ with pkgs;
     httpSupport = true;
     tpmSupport = true;
     tlsSupport = true;
-    msVarsTemplate = stdenv.isx86_64;
+    msVarsTemplate = stdenv.isx86_64 || stdenv.isAarch64;
   };
 
   ops = callPackage ../applications/virtualization/ops { };