Merge pull request #82317 from dasj19/latest-kodi-15.1

kodi 18.5 -> 18.6

authored by

Carles Pagès and committed by
GitHub
e28f291d 2f9a9064

+3 -12
+3 -12
pkgs/applications/video/kodi/default.nix
··· 43 43 assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; 44 44 45 45 let 46 - kodiReleaseDate = "20191116"; 47 - kodiVersion = "18.5"; 46 + kodiReleaseDate = "20200301"; 47 + kodiVersion = "18.6"; 48 48 rel = "Leia"; 49 49 50 50 kodi_src = fetchFromGitHub { 51 51 owner = "xbmc"; 52 52 repo = "xbmc"; 53 53 rev = "${kodiVersion}-${rel}"; 54 - sha256 = "0pcrraj1ddzrd296br10yjnaxgb3iym74xzixcakaqhhp00f5hf6"; 54 + sha256 = "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk"; 55 55 }; 56 56 57 57 cmakeProto = fetchurl { ··· 193 193 pkgconfig gnumake 194 194 autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 195 195 ] ++ lib.optionals useWayland [ wayland-protocols ]; 196 - 197 - patches = [ 198 - # Adds missing cassert includes, fixing builds. This will be unnecessary 199 - # after 18.6 is released (which will contain this patch) 200 - (fetchpatch { 201 - url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch"; 202 - sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2"; 203 - }) 204 - ]; 205 196 206 197 cmakeFlags = [ 207 198 "-Dlibdvdcss_URL=${libdvdcss.src}"