ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #265562 from reckenrode/qt5-webengine-fix

Browse Source 
qt5.qtwebengine: pin clang version to clang 15
This commit is contained in:
Weijia Wang 2023-11-07 01:10:18 +01:00 committed by GitHub
commit 825f80fbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -11,6 +11,7 @@ Check for any minor version changes.
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl, python3
, gstreamer, gst-plugins-base, gtk3, dconf
, llvmPackages_15, overrideSDK, overrideLibcxx
, darwin
# options
@ -288,6 +289,18 @@ let
qtwayland = callPackage ../modules/qtwayland.nix {};
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {
# The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due
# to the following errors:
# * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned
# to be made into a hard error in a future version of clang. Patches are not available for
# the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial.
# * -Wincompatible-function-pointer-types: This is also a downgradable error generated
# starting with clang 16. Patches are available upstream that can be backported.
# Because the first error is non-trivial to fix and suppressing it risks future breakage,
# clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.
stdenv =
let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
inherit (srcs.qtwebengine) version;
python = python3;
postPatch = ''

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

@ -306,7 +306,6 @@ qtModule ({
isAarch64
(patternLogicalAnd isMips isLittleEndian)
]);
broken = stdenv.isDarwin && stdenv.isx86_64;
# This build takes a long time; particularly on slow architectures
timeout = 24 * 3600;

1
pkgs/top-level/all-packages.nix
View File

@ -24691,6 +24691,7 @@ with pkgs;
inherit (__splicedPackages)
makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
bison cups dconf harfbuzz libGL perl gtk3 python3
llvmPackages_15 overrideSDK overrideLibcxx
darwin;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
inherit config;