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

Merge pull request #68869 from worldofpeace/fix-FTFS-qtwebengine

Browse Source 
qt5.qtwebengine: reduce log output
This commit is contained in:
worldofpeace 2019-09-15 21:08:43 -04:00 committed by GitHub
commit c0d5c03c8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -103,24 +103,27 @@ EOF
--replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
''); '');
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE = [
# it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
# TODO: investigate and fix properly "-Wno-class-memaccess"
lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++ ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
lib.optionals stdenv.isDarwin [ # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" # TODO: investigate and fix properly
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" "-march=westmere"
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
# #
# Prevent errors like # Prevent errors like
# /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
# error: pointer to non-const type 'id' with no explicit ownership # error: pointer to non-const type 'id' with no explicit ownership
# id** _kvcPropertyAccessors; # id** _kvcPropertyAccessors;
# #
# TODO remove when new Apple SDK is in # TODO remove when new Apple SDK is in
# #
"-fno-objc-arc" "-fno-objc-arc"
]; ];
preConfigure = '' preConfigure = ''
export NINJAFLAGS=-j$NIX_BUILD_CORES export NINJAFLAGS=-j$NIX_BUILD_CORES