grantlee: Fix build with patch

Fixes the build with C++20.
The patch is from an unmerged PR (upstream has been inactive for 4
years), so copy the patch as a file.
This commit is contained in:
Flakebi
2026-10-01 09:24:41 +02:00
parent b4fd65b198
commit 60926ec004
2 changed files with 29 additions and 0 deletions

View File

@@ -0,0 +1,26 @@
From 261bfe75d718abfc537ddcebfe805df01c33ab3a Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Sat, 25 Apr 2026 10:21:47 +0200
Subject: [PATCH] Remove template-id in constructor of template class
It was not required, and it is invalid now in C++ 20.
---
templates/defaulttags/cycle.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/defaulttags/cycle.h b/templates/defaulttags/cycle.h
index 936c2a2e..a917555f 100644
--- a/templates/defaulttags/cycle.h
+++ b/templates/defaulttags/cycle.h
@@ -40,9 +40,9 @@ Cycles endlessly over elements.
template <typename T> class RingIterator
{
public:
- RingIterator<T>() {}
+ RingIterator() {}
- RingIterator<T>(const QList<T> &list)
+ RingIterator(const QList<T> &list)
: m_begin(list.constBegin()), m_it(list.constBegin()),
m_end(list.constEnd())
{

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
qt5,
cmake,
}:
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
patches = [
./grantlee-nix-profiles.patch
./grantlee-no-canonicalize-filepath.patch
# https://github.com/steveire/grantlee/pull/93
./Fix-cpp-20-build.patch
];
outputs = [