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
This commit is contained in:
commit
18705145b8
@ -21,24 +21,21 @@
|
|||||||
, qtwebchannel
|
, qtwebchannel
|
||||||
, qtwebengine
|
, qtwebengine
|
||||||
, qtx11extras
|
, qtx11extras
|
||||||
, jellyfin-web
|
|
||||||
, withDbus ? stdenv.isLinux
|
, withDbus ? stdenv.isLinux
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "jellyfin-media-player";
|
pname = "jellyfin-media-player";
|
||||||
version = "1.10.1";
|
version = "1.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jellyfin";
|
owner = "jellyfin";
|
||||||
repo = "jellyfin-media-player";
|
repo = "jellyfin-media-player";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE=";
|
sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
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 since the end user can't simply download the release artifacts to update
|
||||||
./disable-update-notifications.patch
|
./disable-update-notifications.patch
|
||||||
];
|
];
|
||||||
@ -77,11 +74,6 @@ mkDerivation rec {
|
|||||||
"-DLINUX_X11POWER=ON"
|
"-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 ''
|
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||||
mkdir -p $out/bin $out/Applications
|
mkdir -p $out/bin $out/Applications
|
||||||
mv "$out/Jellyfin Media Player.app" $out/Applications
|
mv "$out/Jellyfin Media Player.app" $out/Applications
|
||||||
|
@ -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()
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user