Unverified Commit 97904f84 authored by rnhmjoj's avatar rnhmjoj
Browse files

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

pkgs/development/libraries/qt-5/5.15/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,9 @@ let 
      qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};

      qtwayland = callPackage ../modules/qtwayland.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 {};

      qtwebkit = callPackage ../modules/qtwebkit.nix {};

      qtwebsockets = callPackage ../modules/qtwebsockets.nix {};

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin

, ffmpeg_3 ? null

, lib, stdenv, fetchpatch

, version ? null

, qtCompatVersion

}:
@@ -230,6 +231,9 @@ qtModule { 
    [Paths]

    Prefix = ..

    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; {