Merge pull request #56467 from minijackson/kodi_vfs_addons

kodiPlugins: init vfs.{sftp, libarchive}
This commit is contained in:
worldofpeace 2019-02-27 19:16:26 -05:00 committed by GitHub
commit 83c92d8215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 1 deletions

View File

@ -5286,4 +5286,9 @@
github = "shmish111";
name = "David Smith";
};
minijackson = {
email = "minijackson@riseup.net";
github = "minijackson";
name = "Rémi Nicole";
};
}

View File

@ -1,7 +1,8 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
, python2Packages, expat, glib, nspr, nss }:
, python2Packages, expat, glib, nspr, nss, openssl
, libssh, libarchive, lzma, bzip2, lz4, lzo }:
with stdenv.lib;
@ -506,4 +507,47 @@ let self = rec {
};
};
vfs-sftp = mkKodiABIPlugin rec {
namespace = "vfs.sftp";
version = "1.0.1";
plugin = namespace;
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v";
};
meta = with stdenv.lib; {
description = "SFTP Virtual Filesystem add-on for Kodi";
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
};
extraBuildInputs = [ openssl libssh zlib ];
};
vfs-libarchive = mkKodiABIPlugin rec {
namespace = "vfs.libarchive";
version = "1.0.5";
plugin = namespace;
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8";
};
meta = with stdenv.lib; {
description = "LibArchive Virtual Filesystem add-on for Kodi";
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
};
extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
};
}; in self

View File

@ -20155,6 +20155,8 @@ in
++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun
++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple
++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive
++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp
++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive
);
};