about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorKonrad Borowski <konrad@borowski.pw>2020-02-21 08:54:53 +0100
committerKonrad Borowski <konrad@borowski.pw>2020-02-22 19:27:43 +0100
commit69668e93d82945ed36f165407b4831276b6a1530 (patch)
tree915b68eab22e9723b2e01e964205407aef90743e /pkgs/applications/video
parentc38529df78e402f945a8d51439b2c92d2a249d86 (diff)
downloadnixlib-69668e93d82945ed36f165407b4831276b6a1530.tar
nixlib-69668e93d82945ed36f165407b4831276b6a1530.tar.gz
nixlib-69668e93d82945ed36f165407b4831276b6a1530.tar.bz2
nixlib-69668e93d82945ed36f165407b4831276b6a1530.tar.lz
nixlib-69668e93d82945ed36f165407b4831276b6a1530.tar.xz
nixlib-69668e93d82945ed36f165407b4831276b6a1530.tar.zst
nixlib-69668e93d82945ed36f165407b4831276b6a1530.zip
kodi: fix build
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/kodi/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 4fae93aa1a18..eef390d30ed8 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
+{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
 , pkgconfig, cmake, gnumake, yasm, python2Packages
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
@@ -194,6 +194,15 @@ in stdenv.mkDerivation {
       autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
     ] ++ lib.optionals useWayland [ wayland-protocols ];
 
+    patches = [
+      # Adds missing cassert includes, fixing builds. This will be unnecessary
+      # after 18.6 is released (which will contain this patch)
+      (fetchpatch {
+        url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch";
+        sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2";
+      })
+    ];
+
     cmakeFlags = [
       "-Dlibdvdcss_URL=${libdvdcss.src}"
       "-Dlibdvdnav_URL=${libdvdnav.src}"