talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

libsForQt5.qtwebengine: bump LLVM to 19

Browse Source 
Nobody is going to fix the warnings because it’s unmaintained
and silencing them won’t make them go away. This will be marked
`knownVulnerabilities` soon enough, too.

We don’t need `overrideLibcxx` because LLVM 19 is currently the
default and we’ll switch to the system C++ library on Darwin when
bumping it.
This commit is contained in:
Emily 2025-08-11 14:22:08 +01:00
parent 6774d062fe
commit fb89ed3681
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,7 @@
gst-plugins-base, gst-plugins-base,
gtk3, gtk3,
dconf, dconf,
llvmPackages_15, llvmPackages_19,
overrideLibcxx,
darwin, darwin,
# options # options
@ -328,16 +327,9 @@ let
qtwayland = callPackage ../modules/qtwayland.nix { }; qtwayland = callPackage ../modules/qtwayland.nix { };
qtwebchannel = callPackage ../modules/qtwebchannel.nix { }; qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
qtwebengine = callPackage ../modules/qtwebengine.nix { qtwebengine = callPackage ../modules/qtwebengine.nix {
# The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
# to the following errors: # was made a hard error.
# * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;
# 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 = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
inherit (srcs.qtwebengine) version; inherit (srcs.qtwebengine) version;
inherit (darwin) bootstrap_cmds; inherit (darwin) bootstrap_cmds;
python = python3; python = python3;

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

@ -9099,8 +9099,7 @@ with pkgs;
perl perl
gtk3 gtk3
python3 python3
llvmPackages_15 llvmPackages_19
overrideLibcxx
darwin darwin
; ;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;