pyrox.dev
Merge pull request #220974 from jojosch/jellyfin-media-player-update
jellyfin-media-player: 1.8.1 -> 1.9.0
+7
-7
pkgs/applications/video/jellyfin-media-player/default.nix
+7
-7
pkgs/applications/video/jellyfin-media-player/default.nix
···
28
28
29
29
mkDerivation rec {
30
30
pname = "jellyfin-media-player";
31
-
version = "1.8.1";
31
+
version = "1.9.0";
32
32
33
33
src = fetchFromGitHub {
34
34
owner = "jellyfin";
35
35
repo = "jellyfin-media-player";
36
36
rev = "v${version}";
37
-
sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
37
+
sha256 = "sha256-PfzBxvGroHgjEz4OchnECSfcb1Ds8xbE28yxneaiPuo=";
38
38
};
39
39
40
40
patches = [
41
-
# the webclient-files are not copied in the regular build script. Copy them just like the linux build
42
-
./fix-osx-resources.patch
41
+
# fix the location of the jellyfin-web path
42
+
./fix-web-path.patch
43
43
# disable update notifications since the end user can't simply download the release artifacts to update
44
44
./disable-update-notifications.patch
45
45
];
···
79
79
"-DLINUX_X11POWER=ON"
80
80
];
81
81
82
-
preBuild = ''
83
-
# link the jellyfin-web files to the expected "dist" directory
84
-
ln -s ${jellyfin-web}/share/jellyfin-web dist
82
+
preConfigure = ''
83
+
# link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
84
+
ln -s ${jellyfin-web}/share/jellyfin-web .
85
85
'';
86
86
87
87
postInstall = lib.optionalString stdenv.isDarwin ''
-15
pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
-15
pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
···
1
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2
-
index 780c0d3..d9c2341 100644
3
-
--- a/src/CMakeLists.txt
4
-
+++ b/src/CMakeLists.txt
5
-
@@ -108,8 +108,8 @@ endif()
6
-
set(RESOURCE_ROOT .)
7
-
if(APPLE)
8
-
set(RESOURCE_ROOT Resources)
9
-
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
10
-
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
11
-
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
12
-
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
13
-
endif()
14
-
15
-
if(NOT APPLE)
+28
pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
+28
pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
···
1
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2
+
index 5abca9b..d09176b 100644
3
+
--- a/src/CMakeLists.txt
4
+
+++ b/src/CMakeLists.txt
5
+
@@ -107,10 +107,8 @@ endif()
6
+
set(RESOURCE_ROOT .)
7
+
if(APPLE)
8
+
set(RESOURCE_ROOT Resources)
9
+
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
10
+
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
11
+
- endif()
12
+
- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
13
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
14
+
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
15
+
endif()
16
+
17
+
if(NOT APPLE)
18
+
@@ -123,9 +121,7 @@ if(NOT APPLE)
19
+
install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
20
+
endif()
21
+
endforeach()
22
+
- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
23
+
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
24
+
- endif()
25
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
26
+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
27
+
endif()
28
+