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

Merge pull request #40031 from knedlsepp/reduce-qt5.qtwebkit-logsize

Browse Source 
qt5.qtwebkit: Reduce log size to fix hydra build
This commit is contained in:
Matthew Justin Bauer 2018-05-06 20:46:55 +00:00 committed by GitHub
commit 938fd3042e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 = ''
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"''