diff options
author | Jeremy Fleischman <jeremyfleischman@gmail.com> | 2022-01-18 17:52:01 -0800 |
---|---|---|
committer | Jeremy Fleischman <jeremyfleischman@gmail.com> | 2022-04-07 21:52:16 -0700 |
commit | cb720edb7dd3529787bdd2945e5da9402c3bca08 (patch) | |
tree | 606736c8832eb073b1b776fcda8eb4bedabfa106 /pkgs/applications/video/kodi/wrapper.nix | |
parent | 52e235a85452b0831274056248e82b09aede7574 (diff) | |
download | nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar.gz nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar.bz2 nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar.lz nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar.xz nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.tar.zst nixlib-cb720edb7dd3529787bdd2945e5da9402c3bca08.zip |
kodi: More robust handling of kodi webserver assets
This adds a backport of https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 to Kodi 19.4 Matrix. This can be removed once a new release of Kodi comes out and we upgrade to it. What's nice about this approach is that it doesn't special case webinterface.default. I've never actually tried using a non-default web interface with Kodi, but I bet it wouldn't have worked before this change, and I think it would work after this change =) See and https://github.com/NixOS/nixpkgs/pull/152675#issuecomment-1003442175 and https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for some discussion about this approach.
Diffstat (limited to 'pkgs/applications/video/kodi/wrapper.nix')
-rw-r--r-- | pkgs/applications/video/kodi/wrapper.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 2380d0023d57..52b7679a325e 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -35,11 +35,5 @@ buildEnv { (lib.concatMap (plugin: plugin.extraRuntimeDependencies or []) addons)}" done - - # makeWrapper just created webinterface.default as a symlink. However, - # kodi's webserver carefully refuses to follow symlinks, so we need to copy - # these assets instead. - rm $out/share/kodi/addons/webinterface.default - cp -r ${kodi}/share/kodi/addons/webinterface.default/ $out/share/kodi/addons/webinterface.default ''; } |