pkgs: remove jellyfin-media-player-qt6, since i never used it in years
This commit is contained in:
@@ -1,24 +0,0 @@
|
|||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index bcebe43..a15b0ef 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -107,8 +107,8 @@ endif()
|
|
||||||
set(RESOURCE_ROOT .)
|
|
||||||
if(APPLE)
|
|
||||||
set(RESOURCE_ROOT Resources)
|
|
||||||
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
|
|
||||||
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
|
|
||||||
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
|
|
||||||
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT APPLE)
|
|
||||||
@@ -121,7 +121,7 @@ if(NOT APPLE)
|
|
||||||
install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
|
|
||||||
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
|
|
||||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
|
|
||||||
endif()
|
|
||||||
|
|
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/input/InputComponent.cpp b/src/input/InputComponent.cpp
|
|
||||||
index 0f5f129..94596b6 100644
|
|
||||||
--- a/src/input/InputComponent.cpp
|
|
||||||
+++ b/src/input/InputComponent.cpp
|
|
||||||
@@ -132,7 +132,7 @@ void InputComponent::handleAction(const QString& action)
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qDebug() << "Invoking slot" << qPrintable(recvSlot->m_slot.data());
|
|
||||||
- QGenericArgument arg0 = QGenericArgument();
|
|
||||||
+ QMetaMethodArgument arg0;
|
|
||||||
|
|
||||||
if (recvSlot->m_hasArguments)
|
|
||||||
arg0 = Q_ARG(const QString&, hostArguments);
|
|
@@ -1,14 +0,0 @@
|
|||||||
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)
|
|
||||||
|
|
@@ -1,68 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, buildPackages
|
|
||||||
, cmake
|
|
||||||
, fetchFromGitHub
|
|
||||||
, jellyfin-media-player
|
|
||||||
, libGL
|
|
||||||
, libX11
|
|
||||||
, libXrandr
|
|
||||||
, libvdpau
|
|
||||||
, mpv
|
|
||||||
, ninja
|
|
||||||
, pkg-config
|
|
||||||
, python3
|
|
||||||
, qt6
|
|
||||||
, SDL2
|
|
||||||
, stdenv
|
|
||||||
}:
|
|
||||||
(jellyfin-media-player.overrideAttrs (upstream: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "jellyfin";
|
|
||||||
repo = "jellyfin-media-player";
|
|
||||||
rev = "qt6";
|
|
||||||
hash = "sha256-CXuK6PLGOiBDbnLqXcr5sUtQmXksMc6X6GKVMEzmu30=";
|
|
||||||
};
|
|
||||||
# nixos ships two patches:
|
|
||||||
# - the first fixes "web paths" and has *mostly* been upstreamed (so skip and manually tweak a bit)
|
|
||||||
# - the second disables auto-update notifications (keep)
|
|
||||||
patches = (builtins.tail upstream.patches) ++ [
|
|
||||||
./0001-fix-web-path.patch
|
|
||||||
# ./0002-qt6-build-fixes.patch
|
|
||||||
# ./0003-qt6-components-webengine.patch
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
SDL2
|
|
||||||
libGL
|
|
||||||
libX11
|
|
||||||
libXrandr
|
|
||||||
libvdpau
|
|
||||||
mpv
|
|
||||||
qt6.qtbase
|
|
||||||
qt6.qtwebchannel
|
|
||||||
qt6.qtwebengine
|
|
||||||
# qtx11extras
|
|
||||||
qt6.qt5compat #< new
|
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
|
||||||
qt6.qtwayland
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
ninja
|
|
||||||
pkg-config
|
|
||||||
python3
|
|
||||||
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 // {
|
|
||||||
platforms = upstream.meta.platforms ++ [ "aarch64-linux" ];
|
|
||||||
};
|
|
||||||
}))
|
|
Reference in New Issue
Block a user