diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-06 20:46:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 20:46:55 +0000 |
| commit | 938fd3042ee3ef49f5a18a5ae669a2f566382957 (patch) | |
| tree | 60c204d73e4387845772a4a74cfbd03041e0f98d /pkgs | |
| parent | 9d3c5ce32e6ff575013c965c328fc1e1e5a39ee5 (diff) | |
| parent | 472f21951a6e5bf4170594a5dc3c2616c7af316d (diff) | |
| download | nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar.gz nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar.bz2 nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar.lz nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar.xz nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.tar.zst nixlib-938fd3042ee3ef49f5a18a5ae669a2f566382957.zip | |
Merge pull request #40031 from knedlsepp/reduce-qt5.qtwebkit-logsize
qt5.qtwebkit: Reduce log size to fix hydra build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 |
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"'' |