aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 78404ddffa8..542afdd55da 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -50,13 +50,12 @@ qtModule {
export qmakeFlags="$qmakeFlags CONFIG+=silent"
'';
- NIX_CFLAGS_COMPILE =
- [
+ NIX_CFLAGS_COMPILE = [
# 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 gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
+ ++ optional stdenv.cc.isGNU "-Wno-class-memaccess"
# with clang this warning blows the log over Hydra's limit
++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
++ optionals flashplayerFix