Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8d0dc8d737cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9bbad4c62545
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 9, 2019

  1. qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang 

    With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.

(cherry picked from commit 3bfe087)
    @d-goldin @worldofpeace
    d-goldin authored and worldofpeace committed Oct 9, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 063CCCAD04182D32
    Expired
    Learn about vigilant mode
    Copy the full SHA
    9bbad4c View commit details
Showing with 4 additions and 5 deletions.
  1. +1 −1 pkgs/development/libraries/qt-5/modules/qtwebengine.nix
  2. +3 −4 pkgs/development/libraries/qt-5/modules/qtwebkit.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file
Original file line number Diff line number Diff line change
@@ -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") [
7 changes: 3 additions & 4 deletions pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View file
Original file line number Diff line number Diff line change
@@ -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