From a88c3bbfe1ca298965bca72ae3fdd23b63433e55 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Sun, 2 Jan 2022 01:25:18 -0800 Subject: kodi: allow using patch with kodi addons I see no reason why we shouldn't just copy from `.` rather than `$src`. One benefit of this is that the various patch phases update the context of `.` rather than the immutable `$src`, which means they actually have an effect on the build derivation now. --- pkgs/applications/video/kodi/build-kodi-addon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/video/kodi') diff --git a/pkgs/applications/video/kodi/build-kodi-addon.nix b/pkgs/applications/video/kodi/build-kodi-addon.nix index 572d5dda80530..8f9c05d8fa12e 100644 --- a/pkgs/applications/video/kodi/build-kodi-addon.nix +++ b/pkgs/applications/video/kodi/build-kodi-addon.nix @@ -13,7 +13,7 @@ toKodiAddon (stdenv.mkDerivation ({ installPhase = '' runHook preInstall - cd $src/$sourceDir + cd ./$sourceDir d=$out${addonDir}/${namespace} mkdir -p $d sauce="." -- cgit 1.4.1 From 58058239d4198f19d8df2d61156b0ca5558ae59e Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Wed, 29 Dec 2021 04:21:08 -0800 Subject: kodi: workaround for addon path bug in youtube addon I've submitted a PR upstream to address this: https://github.com/anxdpanic/plugin.video.youtube/pull/260, this just pulls the patch in sooner to get things unbroken for Nix users. --- pkgs/applications/video/kodi/addons/youtube/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/video/kodi') diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 090e09d55ef6d..632b421ccfab1 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }: +{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; @@ -23,6 +23,15 @@ buildKodiAddon rec { }; }; + patches = [ + # This patch can be removed once https://github.com/anxdpanic/plugin.video.youtube/pull/260 has been merged. + (fetchpatch { + name = "fix-addon-path"; + url = "https://patch-diff.githubusercontent.com/raw/anxdpanic/plugin.video.youtube/pull/260.patch"; + sha256 = "11c9sfwl5kvfll2jws5b4i46s60v6gkfns4al13p4m5ch9rk06hs"; + }) + ]; + meta = with lib; { homepage = "https://github.com/anxdpanic/plugin.video.youtube"; description = "YouTube is one of the biggest video-sharing websites of the world"; -- cgit 1.4.1