Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-09-12 22:49:43 +02:00
176 changed files with 3834 additions and 3772 deletions
@@ -51,8 +51,12 @@ qtModule {
'';
NIX_CFLAGS_COMPILE =
# with gcc7 this warning blows the log over Hydra's limit
[ "-Wno-expansion-to-defined" ]
[
# with gcc7 this warning blows the log over Hydra's limit
"-Wno-expansion-to-defined"
# with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
"-Wno-class-memaccess"
]
# with clang this warning blows the log over Hydra's limit
++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
++ optionals flashplayerFix