diff --git a/pkgs/additional/jellyfin-media-player-qt6/0003-qt6-components-webengine.patch b/pkgs/additional/jellyfin-media-player-qt6/0003-qt6-components-webengine.patch new file mode 100644 index 00000000..d9c3bcbc --- /dev/null +++ b/pkgs/additional/jellyfin-media-player-qt6/0003-qt6-components-webengine.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeModules/QtConfiguration.cmake b/CMakeModules/QtConfiguration.cmake +index d74a484..fb678ad 100644 +--- a/CMakeModules/QtConfiguration.cmake ++++ b/CMakeModules/QtConfiguration.cmake +@@ -53,8 +53,7 @@ foreach(COMP ${components}) + find_package(Qt6 REQUIRED COMPONENTS Gui) + find_package(Qt6 REQUIRED COMPONENTS Quick) + find_package(Qt6 REQUIRED COMPONENTS Widgets) +- find_package(Qt6 REQUIRED COMPONENTS WebEngineQuick) +- find_package(Qt6 REQUIRED COMPONENTS WebEngineCore) ++ find_package(Qt6 REQUIRED COMPONENTS WebEngine) + find_package(Qt6 REQUIRED COMPONENTS OpenGL) + find_package(Qt6 REQUIRED COMPONENTS DBus) + diff --git a/pkgs/additional/jellyfin-media-player-qt6/default.nix b/pkgs/additional/jellyfin-media-player-qt6/default.nix index b157987b..8e9eafcc 100644 --- a/pkgs/additional/jellyfin-media-player-qt6/default.nix +++ b/pkgs/additional/jellyfin-media-player-qt6/default.nix @@ -1,4 +1,5 @@ { lib +, buildPackages , cmake , fetchFromGitHub , jellyfin-media-player @@ -27,6 +28,7 @@ patches = (builtins.tail upstream.patches) ++ [ ./0001-fix-web-path.patch ./0002-qt6-build-fixes.patch + # ./0003-qt6-components-webengine.patch ]; buildInputs = [ SDL2 @@ -39,6 +41,7 @@ qt6.qtwebchannel qt6.qtwebengine # qtx11extras + qt6.qt5compat #< new ] ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ]; @@ -49,15 +52,15 @@ pkg-config python3 - # new packages which weren't needed before - qt6.wrapQtAppsHook # replaces the implicit qt5 version - qt6.qt5compat + qt6.wrapQtAppsHook #< new: libsForQt5.callPackage implicitly adds the qt5 wrapQtAppsHook ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qt6.qtbase}" "-GNinja" + # "-DQT_DEBUG_FIND_PACKAGE=ON" + # "--debug-find-pkg=Qt6WebEngineQuick" ]; meta = upstream.meta // {