diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-01-16 00:58:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-16 00:58:28 +0100 |
commit | cf22efecf07fbb299f68cab2fdc3ea50e48758c1 (patch) | |
tree | 991766b6031e7cd4ca4fe2dd87f62a56d301c1c3 /pkgs/applications | |
parent | 914c0fb9ac70a59412ac2ad7e0538e18742666d7 (diff) | |
parent | 55888e7a13fcc67cbf148798d0da8fbdc8273896 (diff) |
Merge pull request #210941 from aanderse/kodi-fix
kodi: fix build
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/video/kodi/unwrapped.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 1dae66723379f..525ac2400bb3b 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -107,13 +107,20 @@ in stdenv.mkDerivation { src = kodi_src; - # This is 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. patches = [ + # This is a backport of + # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 + # to Kodi 19.4 Matrix. + # This can be removed once a new major release of Kodi comes out and we upgrade + # to it. ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch + + # A patch to fix build until the next major release of Kodi comes out and we upgrade + # https://github.com/xbmc/xbmc/pull/22291 + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; + sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; + }) ]; buildInputs = [ |