tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / applications / video / jellyfin-media-player / fix-web-path.patch
at devShellTools-shell 38 lines 1.5 kB view raw
1diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 2index 9df49da..be1c479 100644 3--- a/src/CMakeLists.txt 4+++ b/src/CMakeLists.txt 5@@ -106,7 +106,8 @@ endif() 6 set(RESOURCE_ROOT .) 7 if(APPLE) 8 set(RESOURCE_ROOT Resources) 9- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) 10+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) 11+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) 12 endif() 13 14 if(NOT APPLE) 15@@ -119,6 +120,7 @@ if(NOT APPLE) 16 install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) 17 endif() 18 endforeach() 19+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) 20 install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) 21 endif() 22 23diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp 24index c398523..7023948 100644 25--- a/src/settings/SettingsComponent.cpp 26+++ b/src/settings/SettingsComponent.cpp 27@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop) 28 29 if (url == "bundled") 30 { 31- auto path = Paths::webExtensionPath() + "find-webclient.html"; 32+ auto path = Paths::webClientPath("desktop"); 33 34 url = "file:///" + path; 35 } 36-- 372.36.0 38