diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
| commit | e2e3861d6b57a53fd7774a7c31d0295bbd256930 (patch) | |
| tree | f0f8fb922a439ae239d522ac79bd40d80efd234f /pkgs/development/libraries/qt-5 | |
| parent | a7c52c451e541514fe324bec2916758c031d3af8 (diff) | |
| parent | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (diff) | |
| download | nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.gz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.bz2 nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.lz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.xz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.zst nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index c96aef3f4da..df444eee2eb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,7 +103,7 @@ EOF --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' ''); - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit "-Wno-class-memaccess" ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 78404ddffa8..542afdd55da 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/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 |