JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5.qtwebkit: Reduce log size to fix hydra build

Browse Source 
This should fix the darwin build of qtwebkit.
This commit is contained in:
Josef Kemetmüller 2018-05-06 16:46:55 +02:00
parent d8e3ce750f
commit 472f21951a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -28,10 +28,15 @@ qtModule {
preConfigure = '' preConfigure = ''
QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
fixQtBuiltinPaths . '*.pr?' fixQtBuiltinPaths . '*.pr?'
# Fix hydra's "Log limit exceeded"
export qmakeFlags="$qmakeFlags CONFIG+=silent"
''; '';
NIX_CFLAGS_COMPILE = 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 ++ optionals flashplayerFix
[ [
''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''