about summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/modules
diff options
context:
space:
mode:
authorJosef Kemetmüller <josef.kemetmueller@gmail.com>2018-05-06 16:46:55 +0200
committerJosef Kemetmüller <josef.kemetmueller@gmail.com>2018-05-06 18:44:31 +0200
commit472f21951a6e5bf4170594a5dc3c2616c7af316d (patch)
tree0681fb9b87696f9112a86302df10d52bd02e3cb7 /pkgs/development/libraries/qt-5/modules
parentd8e3ce750f9f851e0f96c521ae3eb03a3d22f253 (diff)
downloadnixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar.gz
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar.bz2
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar.lz
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar.xz
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.tar.zst
nixlib-472f21951a6e5bf4170594a5dc3c2616c7af316d.zip
qt5.qtwebkit: Reduce log size to fix hydra build
This should fix the darwin build of qtwebkit.
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtwebkit.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 6834b7ce87b6..d73bc370f990 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -28,10 +28,15 @@ qtModule {
   preConfigure = ''
     QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fixQtBuiltinPaths . '*.pr?'
+    # Fix hydra's "Log limit exceeded"
+    export qmakeFlags="$qmakeFlags CONFIG+=silent"
   '';
 
   NIX_CFLAGS_COMPILE =
-    [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit
+    # with gcc7 this warning blows the log over Hydra's limit
+    [ "-Wno-expansion-to-defined" ]
+    # with clang this warning blows the log over Hydra's limit
+    ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
     ++ optionals flashplayerFix
       [
         ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''