diff options
author | K900 <me@0upti.me> | 2024-06-18 10:55:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-18 10:55:16 +0300 |
commit | 18705145b85aa18b227225be6f2a845d33132e3b (patch) | |
tree | 4155df6f2731b85f9dd6c26005fc9719fe148200 /pkgs/applications/video | |
parent | 7eabbc2829806a1fa896b82f674c3e0bd23b9dbc (diff) | |
parent | cd180e8ae912db00b09a915937a03b650c22f8b9 (diff) | |
download | nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar.gz nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar.bz2 nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar.lz nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar.xz nixlib-18705145b85aa18b227225be6f2a845d33132e3b.tar.zst nixlib-18705145b85aa18b227225be6f2a845d33132e3b.zip |
Merge pull request #318854 from javaes/jellyfin-media-player/update_from_1.10.1_to_1.11.1
jellyfin-media-player: 1.10.1 -> 1.11.1
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/jellyfin-media-player/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/video/jellyfin-media-player/fix-web-path.patch | 28 |
2 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index d3909c3799bc..fef1a9ae80f0 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,24 +21,21 @@ , qtwebchannel , qtwebengine , qtx11extras -, jellyfin-web , withDbus ? stdenv.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 = [ - # 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 ]; @@ -77,11 +74,6 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - 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 diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch deleted file mode 100644 index 250a5c069545..000000000000 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -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() - |