git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118084 from rnhmjoj/qtwebengine-fix

qt5.qtwebengine: fix Qt version number in cmake

commitf074dbaf218645099c5a2220f0f8b73063ce7902 authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com> dateWed 31 Mar 2021, 19:54 (6 years ago) parent82f3a0d97904f8
2 files changed+7−1
pkgs/development/libraries/qt-5/5.15/default.nix+3−1 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+4
pkgs/development/libraries/qt-5/5.15/default.nix+3−1
@@ -203,7 +203,9 @@ let
203203 qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
204204 qtwayland = callPackage ../modules/qtwayland.nix {};
205205 qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
206− qtwebengine = callPackage ../modules/qtwebengine.nix {};
206+ qtwebengine = callPackage ../modules/qtwebengine.nix {
207+ inherit (srcs.qtwebengine) version;
208+ };
207209 qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
208210 qtwebkit = callPackage ../modules/qtwebkit.nix {};
209211 qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+4
@@ -17,6 +17,7 @@
1717, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
1818, ffmpeg_3 ? null
1919, lib, stdenv, fetchpatch
20+, version ? null
2021, qtCompatVersion
2122}:
2223
@@ -230,6 +231,9 @@ qtModule {
230231 [Paths]
231232 Prefix = ..
232233 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
233237 '';
234238
235239 meta = with lib; {