From 9b3f7971376c0e09702578724a1989df0a07c5c5 Mon Sep 17 00:00:00 2001 From: Raphael Neubert Date: Tue, 21 Jan 2025 20:55:59 +0100 Subject: [PATCH] ola: fix error: template-id not allowed for constructor in C++20 --- pkgs/applications/misc/ola/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index e8642f86ded2..1ac44a057d09 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -15,6 +15,7 @@ libmicrohttpd, perl, python3, + fetchpatch, }: stdenv.mkDerivation rec { @@ -27,7 +28,13 @@ stdenv.mkDerivation rec { tag = version; hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU="; }; - + patches = [ + # Fix build error with GCC 14 due to stricter C++20 compliance (template-id in constructors) + (fetchpatch { + url = "https://github.com/OpenLightingProject/ola/commit/d9b9c78645c578adb7c07b692842e841c48310be.patch"; + hash = "sha256-BplSqQv8ztWMpiX/M3/3wvf6LsPTBglh48gHlUoM6rw="; + }) + ]; nativeBuildInputs = [ autoreconfHook bison