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

qt5.qtwebengine: fix Qt version number in cmake 

This fixes the build failures in packages depending on qtwebengine and
using cmake to find the Qt dependencies (like libsForQt5.messagelib).
This commit is contained in:
rnhmjoj 2021-03-30 18:24:52 +02:00
parent a1452f6ed0
commit 97904f8424
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,9 @@ let
qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
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 {
inherit (srcs.qtwebengine) version;
};
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {};
qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {};

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

@ -17,6 +17,7 @@
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
, ffmpeg_3 ? null , ffmpeg_3 ? null
, lib, stdenv, fetchpatch , lib, stdenv, fetchpatch
, version ? null
, qtCompatVersion , qtCompatVersion
}: }:
@ -230,6 +231,9 @@ qtModule {
[Paths] [Paths]
Prefix = .. Prefix = ..
EOF EOF
'' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") ''
# Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
''; '';
meta = with lib; { meta = with lib; {