Loading pkgs/development/libraries/qt-5/5.15/default.nix +3 −12 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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"; Loading pkgs/development/libraries/qt-5/modules/qtwebengine.nix +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading Loading
pkgs/development/libraries/qt-5/5.15/default.nix +3 −12 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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"; Loading
pkgs/development/libraries/qt-5/modules/qtwebengine.nix +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading