about summary refs log tree commit diff
path: root/pkgs/applications/video/kodi
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2022-01-02 12:07:54 -0500
committerGitHub <noreply@github.com>2022-01-02 12:07:54 -0500
commit76ecba0adbc08d643463c95a1cd7afad820da474 (patch)
treea002888d0604df7dfea30d52b554daefe5f40993 /pkgs/applications/video/kodi
parent2e458686b2467df4cfaac0f3bfa74076ab6b92b4 (diff)
parent58058239d4198f19d8df2d61156b0ca5558ae59e (diff)
Merge pull request #153185 from jfly/easier-kodi-addon-patching-plus-fix-bug-in-youtube-kodi-addon
Easier kodi addon patching + fix bug in youtube kodi addon
Diffstat (limited to 'pkgs/applications/video/kodi')
-rw-r--r--pkgs/applications/video/kodi/addons/youtube/default.nix11
-rw-r--r--pkgs/applications/video/kodi/build-kodi-addon.nix2
2 files changed, 11 insertions, 2 deletions
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";
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="."