This commit is contained in:
mjallen18
2026-01-22 15:37:42 -06:00
parent bfd5e90613
commit 5b96b59e60
2 changed files with 9 additions and 17 deletions

View File

@@ -25,17 +25,11 @@ let
selected = selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null; selected = selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null;
sources = mkAllSources selected; sources = mkAllSources selected;
edk2Src = sources.edk2 // { edk2Src = sources.edk2;
name = sources.edk2.repo;
};
edk2NonOsiSrc = sources."edk2-non-osi" // { edk2NonOsiSrc = sources."edk2-non-osi";
name = sources."edk2-non-osi".repo;
};
edk2PlatformsSrc = sources."edk2-platforms" // { edk2PlatformsSrc = sources."edk2-platforms";
name = sources."edk2-platforms".repo;
};
baseTools = pkgs.${namespace}.edk2-basetools.override { baseTools = pkgs.${namespace}.edk2-basetools.override {
version = "stable202511"; version = "stable202511";
@@ -52,11 +46,6 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version; inherit pname version;
srcs = [
edk2Src
edk2NonOsiSrc
edk2PlatformsSrc
];
# Add required host tools if needed: # Add required host tools if needed:
nativeBuildInputs = [ nativeBuildInputs = [
@@ -87,9 +76,9 @@ stdenv.mkDerivation rec {
unpackPhase = '' unpackPhase = ''
runHook preUnpack runHook preUnpack
for src in $srcs; do cp -r ${edk2Src} ./edk2
unpackFile "$src" cp -r ${edk2NonOsiSrc} ./edk2-non-osi
done cp -r ${edk2PlatformsSrc} ./edk2-platforms
chmod -R u+w . chmod -R u+w .

View File

@@ -5,6 +5,7 @@
"fetcher": "github", "fetcher": "github",
"owner": "tianocore", "owner": "tianocore",
"repo": "edk2", "repo": "edk2",
"name": "edk2",
"tag": "edk2-stable202511", "tag": "edk2-stable202511",
"hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=", "hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=",
"submodules": true "submodules": true
@@ -13,6 +14,7 @@
"fetcher": "github", "fetcher": "github",
"owner": "tianocore", "owner": "tianocore",
"repo": "edk2-non-osi", "repo": "edk2-non-osi",
"name": "edk2-non-osi",
"rev": "94d048981116e2e3eda52dad1a89958ee404098d", "rev": "94d048981116e2e3eda52dad1a89958ee404098d",
"hash": "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk=" "hash": "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk="
}, },
@@ -20,6 +22,7 @@
"fetcher": "github", "fetcher": "github",
"owner": "tianocore", "owner": "tianocore",
"repo": "edk2-platforms", "repo": "edk2-platforms",
"name": "edk2-platforms",
"rev": "0991a0b643509d900e5d023a0116789827a696e5", "rev": "0991a0b643509d900e5d023a0116789827a696e5",
"hash": "sha256-IdACr0NStqEpC0TFoKKgDwKT2mqyJwVXW/B7hlRXccI=" "hash": "sha256-IdACr0NStqEpC0TFoKKgDwKT2mqyJwVXW/B7hlRXccI="
} }