From 20847c0e357524a3252865ab34acd3b0e0737252 Mon Sep 17 00:00:00 2001 From: paumr Date: Sun, 8 Dec 2024 16:56:51 +0100 Subject: [PATCH 1/3] Revert "jellyfin-media-player: 1.10.1 -> 1.11.1" This reverts commit cd180e8ae912db00b09a915937a03b650c22f8b9. --- .../video/jellyfin-media-player/default.nix | 16 ++++++++--- .../jellyfin-media-player/fix-web-path.patch | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/video/jellyfin-media-player/fix-web-path.patch diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 6c25495b0341..f141ff0f3654 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,21 +21,24 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.hostPlatform.isLinux +, jellyfin-web +, withDbus ? stdenv.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.11.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; + sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; }; patches = [ + # fix the location of the jellyfin-web path + ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch ]; @@ -74,7 +77,12 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + preConfigure = '' + # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) + ln -s ${jellyfin-web}/share/jellyfin-web . + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch new file mode 100644 index 000000000000..250a5c069545 --- /dev/null +++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5abca9b..d09176b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -107,10 +107,8 @@ endif() + set(RESOURCE_ROOT .) + if(APPLE) + set(RESOURCE_ROOT Resources) +- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) +- endif() +- 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) +@@ -123,9 +121,7 @@ if(NOT APPLE) + install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) + endif() + endforeach() +- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) +- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) +- endif() ++ 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() + From 22b6ee8848bca70e6ceb81dd2c81e5db81c58aeb Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 9 Dec 2024 16:12:03 +0100 Subject: [PATCH 2/3] jellyfin-media-player: 1.10.1 -> 1.11.1 --- .../video/jellyfin-media-player/default.nix | 6 ++-- .../jellyfin-media-player/fix-web-path.patch | 28 +++++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index f141ff0f3654..e9ec8aa67275 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -22,18 +22,18 @@ , qtwebengine , qtx11extras , jellyfin-web -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; + sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch index 250a5c069545..3f182fd407ef 100644 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch @@ -1,28 +1,38 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5abca9b..d09176b 100644 +index 9df49da..be1c479 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -107,10 +107,8 @@ endif() +@@ -106,7 +106,8 @@ endif() set(RESOURCE_ROOT .) if(APPLE) set(RESOURCE_ROOT Resources) -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) -- endif() - 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) -@@ -123,9 +121,7 @@ if(NOT APPLE) +@@ -119,6 +120,7 @@ if(NOT APPLE) install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) endif() endforeach() -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) -- endif() + 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() +diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp +index c398523..7023948 100644 +--- a/src/settings/SettingsComponent.cpp ++++ b/src/settings/SettingsComponent.cpp +@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop) + + if (url == "bundled") + { +- auto path = Paths::webExtensionPath() + "find-webclient.html"; ++ auto path = Paths::webClientPath("desktop"); + + url = "file:///" + path; + } +-- +2.36.0 + From afa059a15ba28b5524399861d114909c35490cfc Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 9 Dec 2024 16:47:09 +0100 Subject: [PATCH 3/3] jellyfin-media-player: added paumr as maintainer --- pkgs/applications/video/jellyfin-media-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index e9ec8aa67275..174cb55de29d 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -93,7 +93,7 @@ mkDerivation rec { description = "Jellyfin Desktop Client based on Plex Media Player"; license = with licenses; [ gpl2Only mit ]; platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = with maintainers; [ jojosch kranzes ]; + maintainers = with maintainers; [ jojosch kranzes paumr ]; mainProgram = "jellyfinmediaplayer"; }; }