edk

packages/edk2/default.nix

@@ -15,28 +15,29 @@ let
   version = "stable202511";
 
   edk2Src = fetchFromGitHub rec {
-    owner = "tianocore";
+    owner = "mjallen18";
     repo = "edk2";
     name = repo;
-    tag = "edk2-${version}";
-    hash = "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=";
+    #tag = "edk2-${version}";
+    rev = "9765be56f1f816ef737153f5588b3294fcc69a63";
+    hash = "sha256-oqfJbNeOj2BVJqWE+snD6ri3lUO1aNcmPg+eJpjyr5E=";
     fetchSubmodules = true;
   };
 
   edk2NonOsiSrc = fetchFromGitHub rec {
-    owner = "tianocore";
+    owner = "mjallen18";
     repo = "edk2-non-osi";
     name = repo;
-    rev = "94d048981116e2e3eda52dad1a89958ee404098d";
-    hash = "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk=";
+    rev = "09ee44f07ded544d976be8a03dec3715719f638e";
+    hash = "sha256-k7nUb3WaRUIr9IlXdam2WGKPOzKjLNVFLfuD5h4veMc=";
   };
 
   edk2PlatformsSrc = fetchFromGitHub rec {
     owner = "mjallen18";
     repo = "edk2-platforms";
     name = repo;
-    rev = "79827459f7849fa64e58daa9a1fcab7170973fc3";
-    hash = "sha256-fLLyx1shcmKkJUETqunEbPkpJ2SWioHjgiJdqEiPpaE=";
+    rev = "b45583a9af9953133d606e9c142b001bd6d156c2";
+    hash = "sha256-Bg9ujeFIWriOSdpYlQBTzViRlyalJkIPEjQUXDaZl/o=";
   };
 in
 stdenv.mkDerivation rec {
@@ -72,19 +73,6 @@ stdenv.mkDerivation rec {
     runHook postUnpack
   '';
 
-  patchPhase = ''
-    runHook prePatch
-
-    echo "Patching edk2"
-    (cd edk2 && patch -p1 < ${./patches/0001-SD-fixup.patch})
-
-    echo "Patching edk2-non-osi"
-    (cd edk2-non-osi && git apply --binary ${./patches/non-osi/0001-Add-RPi5.patch})
-    (cd edk2-non-osi && git apply --binary ${./patches/non-osi/0002-update-bl31.bin-for-new-DTB-address.patch})
-
-    runHook postPatch
-  '';
-
   buildPhase = ''
     export PYTHON_COMMAND=${python3}/bin/python
     export WORKSPACE=$PWD