diff options
author | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2021-03-10 12:40:30 +0100 |
---|---|---|
committer | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2021-03-10 13:56:22 +0100 |
commit | 474043fc5b36b72613f9b8412e66069ee78b4308 (patch) | |
tree | b4f6cb291e891d787f629638973f00604b994187 /pkgs/applications/video/jellyfin-mpv-shim | |
parent | 5854e454183f1b5368127a8366fa8d9ed842c0c2 (diff) |
jellyfin-mpv-shim: use fetchPypi which includes the shader pack
Diffstat (limited to 'pkgs/applications/video/jellyfin-mpv-shim')
-rw-r--r-- | pkgs/applications/video/jellyfin-mpv-shim/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix | 25 |
2 files changed, 4 insertions, 40 deletions
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 6dc42a47685b7..6b0001ad74a2f 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,20 +1,14 @@ -{ lib, buildPythonApplication, fetchFromGitHub, callPackage +{ lib, buildPythonApplication, fetchPypi , 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.7.1"; - src = fetchFromGitHub { - owner = "iwalton3"; - repo = pname; - rev = "v${version}"; - sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75"; - fetchSubmodules = true; # needed for display_mirror css file + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Fo1auMiYUgJrJGJII+FfHspcke0r/VSSXzGwVNIHtEE="; }; patches = [ @@ -33,11 +27,6 @@ buildPythonApplication rec { rm jellyfin_mpv_shim/win_utils.py ''; - postPatch = '' - # link the default shader pack - ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack - ''; - propagatedBuildInputs = [ jellyfin-apiclient-python mpv diff --git a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix b/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix deleted file mode 100644 index 89a601af4add1..0000000000000 --- a/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "jellyfin-mpv-shim-shader-pack"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "iwalton3"; - repo = "default-shader-pack"; - rev = "v${version}"; - sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr"; - }; - - installPhase = '' - mkdir -p $out - cp -a . $out - ''; - - meta = with lib; { - homepage = "https://github.com/iwalton3/default-shader-pack"; - description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients"; - license = with licenses; [ mit lgpl3Plus unlicense ]; - maintainers = with maintainers; [ jojosch ]; - }; -} |