From 32cd7228f68bd19064caf472ce501caab5777b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 13 Jan 2016 14:27:04 +0100 Subject: [PATCH] kodiPlugins.urlresolver: init at 2.10.0 --- pkgs/applications/video/kodi/plugins.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index a8d25aa8dd8d..5b03c1bcd985 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -92,6 +92,32 @@ in }; + urlresolver = (mkKodiPlugin rec { + + plugin = "urlresolver"; + namespace = "script.module.urlresolver"; + version = "2.10.0"; + + src = fetchFromGitHub { + name = plugin + "-" + version + ".tar.gz"; + owner = "Eldorados"; + repo = namespace; + rev = "72b9d978d90d54bb7a0224a1fd2407143e592984"; + sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/Eldorados/urlresolver"; + description = "Resolve common video host URL's to be playable in XBMC/Kodi"; + maintainers = with maintainers; [ edwtjo ]; + }; + }).override { + patches = [ (fetchpatch { + url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch; + sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m"; + }) ]; + }; + salts = (mkKodiPlugin rec { plugin = "salts"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19722a2d23f4..884992feb1e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13692,14 +13692,14 @@ let wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix { inherit kodi; - plugins = let inherit (lib) optional; in with kodiPlugins; + plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher ++ optional (config.kodi.enableGenesis or false) genesis ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts - ++ optional (config.kodi.enableSALTS or false) salts + ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver] ); };