nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 01:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt5.qtwebengine: 5.15.3 -> 5.15.5 (#131123)

Browse Source
This commit is contained in:
Yuka 2021-07-28 14:43:08 +02:00 committed by GitHub
parent 56dd74b7fe
commit 3ff7100f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,21 +49,17 @@ let
version = "5.212.0-alpha4";
};
# Even if developed in the public, QtWebEngine does not have official
# releases or new tags since the Qt company made 5.15.3 proprietary.
# Apparently they care more about licensing than the security of their users.
# See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html
qtwebengine =
let
branchName = "5.15.3";
rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0";
branchName = "5.15.5";
rev = "v${branchName}-lts";
in
{
version = "${branchName}-${lib.substring 0 7 rev}";
src = fetchgit {
url = "https://github.com/qt/qtwebengine.git";
sha256 = "1vdgxfbmx4z4qrm2g61dl64gqn3fv5f83jwpp7h1gyfx5z2qvfmv";
sha256 = "12wf30d34sgn82mbz91xybxyn3j1mhvxda452cfkxm232n1f2kjb";
inherit rev branchName;
fetchSubmodules = true;
leaveDotGit = true;
@ -120,11 +116,6 @@ let
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
# Fix crashes with non en_US.UTF-8 locales
(fetchpatch {
url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch";
sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2";
})
# Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch";

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

@ -166,7 +166,7 @@ qtModule {
# X11 libs
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
xorg.libXcomposite xorg.libXdamage libdrm
xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile
] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [
# Pipewire