From c9997666d5de222ff084555dcaf78052754af348 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 5 Apr 2021 10:44:05 +0200 Subject: [PATCH] jellyfin-media-player: init at 1.3.1 --- .../video/jellyfin-media-player/default.nix | 108 ++++++++++++++++++ .../fix-osx-resources.patch | 15 +++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 127 insertions(+) create mode 100644 pkgs/applications/video/jellyfin-media-player/default.nix create mode 100644 pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix new file mode 100644 index 00000000000..bac7619c33a --- /dev/null +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -0,0 +1,108 @@ +{ lib +, fetchFromGitHub +, fetchzip +, mkDerivation +, stdenv +, Cocoa +, CoreAudio +, CoreFoundation +, MediaPlayer +, SDL2 +, cmake +, libGL +, libX11 +, libXrandr +, libvdpau +, mpv +, ninja +, pkg-config +, python3 +, qtbase +, qtwayland +, qtwebchannel +, qtwebengine +, qtx11extras +}: + +mkDerivation rec { + pname = "jellyfin-media-player"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = "jellyfin-media-player"; + rev = "v${version}"; + sha256 = "sha256-rXW6vC0Ow8xFblXjGYaDExAZM8RgqLkDHiX7R8vAWjI="; + }; + + jmpDist = fetchzip { + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2/dist.zip"; + sha256 = "sha256-EpNAN4nzINiwMrmg0e4x3uJRTy5ovx4ZkmP83Kbn4S0="; + }; + + patches = [ + # the webclient-files are not copied in the regular build script. Copy them just like the linux build + ./fix-osx-resources.patch + ]; + + buildInputs = [ + SDL2 + libGL + libX11 + libXrandr + libvdpau + mpv + qtbase + qtwebchannel + qtwebengine + qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + qtwayland + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + CoreAudio + CoreFoundation + MediaPlayer + ]; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DQTROOT=${qtbase}" + "-GNinja" + ]; + + preBuild = '' + # copy the webclient-files to the expected "dist" directory + mkdir -p dist + cp -a ${jmpDist}/* dist + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/bin $out/Applications + mv "$out/Jellyfin Media Player.app" $out/Applications + + # move web-client resources + mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/" + rmdir $out/Resources + + # fix 'Could not find the Qt platform plugin "cocoa" in ""' error + wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" + + ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer + ''; + + meta = with lib; { + homepage = "https://github.com/iwalton3/jellyfin-media-player"; + description = "Jellyfin Desktop Client based on Plex Media Player"; + license = with licenses; [ gpl2Plus mit ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch b/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch new file mode 100644 index 00000000000..5c562295b40 --- /dev/null +++ b/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 780c0d3..d9c2341 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -108,8 +108,8 @@ endif() + set(RESOURCE_ROOT .) + if(APPLE) + set(RESOURCE_ROOT Resources) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) ++ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) + endif() + + if(NOT APPLE) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06742aa4a1c..b9603e6b1dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2643,6 +2643,10 @@ in jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; + jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jotta-cli = callPackage ../applications/misc/jotta-cli { };