Skip to content

Commit 0d90c3b

Browse files
author
Tanel Dettenborn
committed
uefi-firmaware: Fix GCC 14 compile issue
UEFI-firmaware compile fails with "missing binary operator before token "("", because "__has_builtin"-operator is not defined within gcc 14. Patching edk2-sources with existing patch. Patch is fetched from NVIDIA EDK2 repo. Signed-off-by: Tanel Dettenborn <tanel@ssrc.tii.ae>
1 parent 9964549 commit 0d90c3b

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

pkgs/uefi-firmware/default.nix

+16-6
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,22 @@ let
4646
###
4747

4848
# See: https://github.com/NVIDIA/edk2-edkrepo-manifest/blob/main/edk2-nvidia/Jetson/NVIDIAJetsonManifest.xml
49-
edk2-src = fetchFromGitHub {
50-
owner = "NVIDIA";
51-
repo = "edk2";
52-
rev = "r${l4tVersion}-edk2-stable202208";
53-
fetchSubmodules = true;
54-
sha256 = "sha256-w+rZq7Wjni62MJds6QmqpLod+zSFZ/qAN7kRDOit+jo=";
49+
edk2-src = applyPatches {
50+
src = fetchFromGitHub {
51+
owner = "NVIDIA";
52+
repo = "edk2";
53+
rev = "r${l4tVersion}-edk2-stable202208";
54+
fetchSubmodules = true;
55+
sha256 = "sha256-w+rZq7Wjni62MJds6QmqpLod+zSFZ/qAN7kRDOit+jo=";
56+
};
57+
patches = [
58+
# Fix GCC 14 compile issue.
59+
# PR: https://github.com/tianocore/edk2/pull/5781
60+
(fetchpatch {
61+
url = "https://github.com/NVIDIA/edk2/commit/57a890fd03356350a1b7a2a0064c8118f44e9958.patch";
62+
hash = "sha256-on+yJOlH9B2cD1CS9b8Pmg99pzrlrZT6/n4qPHAbDcA=";
63+
})
64+
];
5565
};
5666

5767
edk2-platforms = fetchFromGitHub {

0 commit comments

Comments
 (0)