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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2019-10-12 00:51:55 +02:00
parent a7c52c451e 6c8aed6391
commit e2e3861d6b
772 changed files with 26971 additions and 13572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+1 -1
View File
@@ -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") [
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+3 -4
View File
@@ -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