From 3efe5715cfc845a7d7a2490f1df02fb86b7ff18c Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Thu, 23 Oct 2025 10:48:16 -0500 Subject: [PATCH] kiwix: fix build error with latest qt --- pkgs/applications/misc/kiwix/default.nix | 4 ++++ pkgs/applications/misc/kiwix/remove-Werror.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/misc/kiwix/remove-Werror.patch diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 4f05aa627d64..fd7690db657a 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw="; }; + patches = [ + ./remove-Werror.patch + ]; + nativeBuildInputs = [ qmake pkg-config diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/applications/misc/kiwix/remove-Werror.patch new file mode 100644 index 000000000000..da035478b99f --- /dev/null +++ b/pkgs/applications/misc/kiwix/remove-Werror.patch @@ -0,0 +1,12 @@ +diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro +index c1f4f93..bf10828 100644 +--- a/kiwix-desktop.pro ++++ b/kiwix-desktop.pro +@@ -27,7 +27,6 @@ QMAKE_CXXFLAGS += -std=c++17 + QMAKE_LFLAGS += -std=c++17 + + !win32 { +- QMAKE_CXXFLAGS += -Werror + equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) { + # Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers. + # This can be removed when the Ubuntu package is fixed.