cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #151215 from jojosch/jellyfin-media-player-1.7.0

Browse source 
jellyfin-media-player: 1.6.1 -> 1.7.0
This commit is contained in:
Sandro 2022-06-17 11:55:19 +02:00 committed by GitHub
commit 2dfc6081a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/video/jellyfin-media-player/default.nix
View file

@ -22,22 +22,18 @@
, qtwebchannel , qtwebchannel
, qtwebengine , qtwebengine
, qtx11extras , qtx11extras
, jellyfin-web
}: }:
mkDerivation rec { mkDerivation rec {
pname = "jellyfin-media-player"; pname = "jellyfin-media-player";
version = "1.6.1"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jellyfin"; owner = "jellyfin";
repo = "jellyfin-media-player"; repo = "jellyfin-media-player";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iqwOv95JFxQ1j/9B+oBFAp7mD1/1g2EJYvvUKbrDQes="; sha256 = "sha256-eDCfqSNkKVm8MC4XA1NhQSByy9zhfyQRPM8OlSKcIvc=";
};
jmpDist = fetchzip {
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip";
sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU=";
}; };
patches = [ patches = [
@ -81,9 +77,8 @@ mkDerivation rec {
]; ];
preBuild = '' preBuild = ''
# copy the webclient-files to the expected "dist" directory # link the jellyfin-web files to the expected "dist" directory
mkdir -p dist ln -s ${jellyfin-web}/share/jellyfin-web dist
cp -a ${jmpDist}/* dist
''; '';
postInstall = lib.optionalString stdenv.isDarwin '' postInstall = lib.optionalString stdenv.isDarwin ''