diff options
author | Divam Narula <dfordivam@gmail.com> | 2020-08-16 10:13:57 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-16 10:13:57 +0530 |
commit | 818d24c9db757764e03e4ec94617d6585f44ea2d (patch) | |
tree | 3854dc5a049d1820fbc60dd324cce5e0b5d9077b /pkgs/applications/video/jellyfin-mpv-shim/default.nix | |
parent | fee55e2bb1e9f471bc8342a13ca062c710d39f41 (diff) | |
parent | dfbda2135c3f8f7b158b7621d9745b94c8a56cf8 (diff) | |
download | nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.gz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.bz2 nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.lz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.xz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.zst nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.zip |
Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4
Diffstat (limited to 'pkgs/applications/video/jellyfin-mpv-shim/default.nix')
-rw-r--r-- | pkgs/applications/video/jellyfin-mpv-shim/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 4021fda68b9..825aac4dad2 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,19 +1,27 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, fetchurl +{ stdenv, buildPythonApplication, fetchFromGitHub, callPackage , mpv, python-mpv-jsonipc, jellyfin-apiclient-python , pillow, tkinter, pystray, jinja2, pywebview }: +let + shaderPack = callPackage ./shader-pack.nix {}; +in buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "1.5.11"; + version = "1.7.1"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "14hm8yccdp7w1vdnvdzafk1byhaq1qsr33i4962s1nvm9lafxkr7"; + sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75"; fetchSubmodules = true; # needed for display_mirror css file }; + patches = [ + ./disable-desktop-client.patch + ./disable-update-check.patch + ]; + # override $HOME directory: # error: [Errno 13] Permission denied: '/homeless-shelter' # @@ -25,10 +33,9 @@ buildPythonApplication rec { rm jellyfin_mpv_shim/win_utils.py ''; - # disable the desktop client for now postPatch = '' - substituteInPlace setup.py \ - --replace "'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop'," "" + # link the default shader pack + ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack ''; propagatedBuildInputs = [ |