public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
kodi 18.5 -> 18.6
This commit is contained in:
Carles Pagès 2020-03-20 22:30:25 +01:00 committed by GitHub
commit e28f291d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/video/kodi/default.nix
View File

@ -43,15 +43,15 @@ assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
let let
kodiReleaseDate = "20191116"; kodiReleaseDate = "20200301";
kodiVersion = "18.5"; kodiVersion = "18.6";
rel = "Leia"; rel = "Leia";
kodi_src = fetchFromGitHub { kodi_src = fetchFromGitHub {
owner = "xbmc"; owner = "xbmc";
repo = "xbmc"; repo = "xbmc";
rev = "${kodiVersion}-${rel}"; rev = "${kodiVersion}-${rel}";
sha256 = "0pcrraj1ddzrd296br10yjnaxgb3iym74xzixcakaqhhp00f5hf6"; sha256 = "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk";
}; };
cmakeProto = fetchurl { cmakeProto = fetchurl {
@ -194,15 +194,6 @@ in stdenv.mkDerivation {
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optionals useWayland [ wayland-protocols ]; ] ++ 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 = [ cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdcss_URL=${libdvdcss.src}"
"-Dlibdvdnav_URL=${libdvdnav.src}" "-Dlibdvdnav_URL=${libdvdnav.src}"