edk2: Fix cross-compile (#497458)

2026-03-07 18:05:06 +00:00
parent 7a5d8e9551 cdf448de60
commit 1195c40ada
1 changed files with 7 additions and 2 deletions
@@ -182,8 +182,6 @@ stdenv.mkDerivation (finalAttrs: {
          ++ attrs.nativeBuildInputs or [ ];
          strictDeps = true;

-          env.${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
-
          prePatch = ''
            rm -rf BaseTools
            ln -sv ${buildPackages.edk2}/BaseTools BaseTools
@@ -211,7 +209,14 @@ stdenv.mkDerivation (finalAttrs: {
        // removeAttrs attrs [
          "nativeBuildInputs"
          "depsBuildBuild"
+          "env"
        ]
+        // {
+          env = {
+            ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
+          }
+          // (attrs.env or { });
+        }
      );
  };
 })