diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix new file mode 100644 index 000000000000..32b55d5e0cb2 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -0,0 +1,24 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, kodi, bzip2, zlib }: + +buildKodiBinaryAddon rec { + pname = "inputstream-ffmpegdirect"; + namespace = "inputstream.ffmpegdirect"; + version = "1.19.4"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "inputstream.ffmpegdirect"; + rev = "${version}-${rel}"; + sha256 = "1ppvs6zybbi73zq1qh8klyhj99byh61c6nijmb1gd5yhg7cywf72"; + }; + + extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; + + meta = with lib; { + homepage = "https://github.com/xbmc/inputstream.ffmpegdirect/"; + description = "InputStream Client for streams that can be opened by either FFmpeg's libavformat or Kodi's cURL"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix new file mode 100644 index 000000000000..c575cfccfccf --- /dev/null +++ b/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix @@ -0,0 +1,24 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, rtmpdump, zlib }: + +buildKodiBinaryAddon rec { + pname = "inputstream-rtmp"; + namespace = "inputstream.rtmp"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "inputstream.rtmp"; + rev = "${version}-${rel}"; + sha256 = "1q4k6plkjasnjs7gnbcc1x2mwr562ach7bkqk1z1y343s0dp9qnq"; + }; + + extraBuildInputs = [ openssl rtmpdump zlib ]; + + meta = with lib; { + homepage = "https://github.com/xbmc/inputstream.rtmp/"; + description = "Client for RTMP streams"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 9f160b4fa611..7fe0ed08e8fb 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -1,17 +1,29 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }: +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub +, pugixml, zlib +, inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp +}: + buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.4.2"; + version = "7.5.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; + sha256 = "1q470v9nipnrca0rbwvqlbxw9ccbl9s1k46hwwrh94vhyp5rjlib"; }; - extraBuildInputs = [ zlib pugixml ]; + extraBuildInputs = [ + pugixml + zlib + ]; + propagatedBuildInputs = [ + inputstream-adaptive + inputstream-ffmpegdirect + inputstream-rtmp + ]; meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 1b665418f3f9..6f926176eaf8 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -230,6 +230,7 @@ in stdenv.mkDerivation { passthru = { pythonPackages = python3Packages; + ffmpeg = ffmpeg; }; meta = with lib; { diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 38d1ed6b86ca..fbdf45d4202a 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -106,6 +106,10 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { }; + inputstream-ffmpegdirect = callPackage ../applications/video/kodi-packages/inputstream-ffmpegdirect { }; + + inputstream-rtmp = callPackage ../applications/video/kodi-packages/inputstream-rtmp { }; + inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { }; kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { };