kiwix: fix build error with latest qt
This commit is contained in:
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
|
|||||||
hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
|
hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./remove-Werror.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
qmake
|
qmake
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
12
pkgs/applications/misc/kiwix/remove-Werror.patch
Normal file
12
pkgs/applications/misc/kiwix/remove-Werror.patch
Normal file
@@ -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.
|
||||||
Reference in New Issue
Block a user