Skip to content

Commit 79ade21

Browse files
authored
Fix OLA build failure with C++20 by applying upstream patch (NixOS#375629)
2 parents fa569a3 + 9b3f797 commit 79ade21

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pkgs/applications/misc/ola/default.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
libmicrohttpd,
1616
perl,
1717
python3,
18+
fetchpatch,
1819
}:
1920

2021
stdenv.mkDerivation rec {
@@ -27,7 +28,13 @@ stdenv.mkDerivation rec {
2728
tag = version;
2829
hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU=";
2930
};
30-
31+
patches = [
32+
# Fix build error with GCC 14 due to stricter C++20 compliance (template-id in constructors)
33+
(fetchpatch {
34+
url = "https://github.com/OpenLightingProject/ola/commit/d9b9c78645c578adb7c07b692842e841c48310be.patch";
35+
hash = "sha256-BplSqQv8ztWMpiX/M3/3wvf6LsPTBglh48gHlUoM6rw=";
36+
})
37+
];
3138
nativeBuildInputs = [
3239
autoreconfHook
3340
bison

0 commit comments

Comments
 (0)