From 5b96b59e60b4f6c89a05ba8791e87e6f8a5c8b99 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Thu, 22 Jan 2026 15:37:42 -0600
Subject: [PATCH] edk

---
 packages/edk2/default.nix  | 23 ++++++-----------------
 packages/edk2/version.json |  3 +++
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/packages/edk2/default.nix b/packages/edk2/default.nix
index 5006e8f..db7e5cc 100644
--- a/packages/edk2/default.nix
+++ b/packages/edk2/default.nix
@@ -25,17 +25,11 @@ let
   selected = selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null;
   sources = mkAllSources selected;
 
-  edk2Src = sources.edk2 // {
-    name = sources.edk2.repo;
-  };
+  edk2Src = sources.edk2;
 
-  edk2NonOsiSrc = sources."edk2-non-osi" // {
-    name = sources."edk2-non-osi".repo;
-  };
+  edk2NonOsiSrc = sources."edk2-non-osi";
 
-  edk2PlatformsSrc = sources."edk2-platforms" // {
-    name = sources."edk2-platforms".repo;
-  };
+  edk2PlatformsSrc = sources."edk2-platforms";
 
   baseTools = pkgs.${namespace}.edk2-basetools.override {
     version = "stable202511";
@@ -52,11 +46,6 @@ in
 stdenv.mkDerivation rec {
   inherit pname version;
 
-  srcs = [
-    edk2Src
-    edk2NonOsiSrc
-    edk2PlatformsSrc
-  ];
 
   # Add required host tools if needed:
   nativeBuildInputs = [
@@ -87,9 +76,9 @@ stdenv.mkDerivation rec {
   unpackPhase = ''
     runHook preUnpack
 
-    for src in $srcs; do
-      unpackFile "$src"
-    done
+    cp -r ${edk2Src} ./edk2
+    cp -r ${edk2NonOsiSrc} ./edk2-non-osi
+    cp -r ${edk2PlatformsSrc} ./edk2-platforms
 
     chmod -R u+w .
 
diff --git a/packages/edk2/version.json b/packages/edk2/version.json
index 296d82b..ef48ee1 100644
--- a/packages/edk2/version.json
+++ b/packages/edk2/version.json
@@ -5,6 +5,7 @@
       "fetcher": "github",
       "owner": "tianocore",
       "repo": "edk2",
+      "name": "edk2",
       "tag": "edk2-stable202511",
       "hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=",
       "submodules": true
@@ -13,6 +14,7 @@
       "fetcher": "github",
       "owner": "tianocore",
       "repo": "edk2-non-osi",
+      "name": "edk2-non-osi",
       "rev": "94d048981116e2e3eda52dad1a89958ee404098d",
       "hash": "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk="
     },
@@ -20,6 +22,7 @@
       "fetcher": "github",
       "owner": "tianocore",
       "repo": "edk2-platforms",
+      "name": "edk2-platforms",
       "rev": "0991a0b643509d900e5d023a0116789827a696e5",
       "hash": "sha256-IdACr0NStqEpC0TFoKKgDwKT2mqyJwVXW/B7hlRXccI="
     }