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).

rnhmjoj 97904f84 a1452f6e

+7 -1
+3 -1
pkgs/development/libraries/qt-5/5.15/default.nix
··· 203 203 qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; 204 204 qtwayland = callPackage ../modules/qtwayland.nix {}; 205 205 qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; 206 - qtwebengine = callPackage ../modules/qtwebengine.nix {}; 206 + qtwebengine = callPackage ../modules/qtwebengine.nix { 207 + inherit (srcs.qtwebengine) version; 208 + }; 207 209 qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; 208 210 qtwebkit = callPackage ../modules/qtwebkit.nix {}; 209 211 qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
+4
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
··· 17 17 , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin 18 18 , ffmpeg_3 ? null 19 19 , lib, stdenv, fetchpatch 20 + , version ? null 20 21 , qtCompatVersion 21 22 }: 22 23 ··· 230 231 [Paths] 231 232 Prefix = .. 232 233 EOF 234 + '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") '' 235 + # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) 236 + sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake 233 237 ''; 234 238 235 239 meta = with lib; {