Unverified Commit 4a7f73a1 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

kiwix: fix build error with latest qt (#454949)

parents f0a7dfc1 3efe5715

pkgs/applications/misc/kiwix/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec { 
    hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";

  };



  patches = [

    ./remove-Werror.patch

  ];



  nativeBuildInputs = [

    qmake

    pkg-config

pkgs/applications/misc/kiwix/remove-Werror.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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.