From 40d46f9ca4066ed52b023b2e9a5054aa68fcf097 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Sun, 2 Apr 2017 14:12:24 +0200 Subject: [PATCH] Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback) --- pkgs/applications/video/kodi/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 9c421e0c8280..10656af4ef40 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,6 +43,15 @@ let url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz"; sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; + # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback: + libdvdnav_src = fetchurl { + url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz"; + sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d"; + }; + libdvdread_src = fetchurl { + url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz"; + sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b"; + }; in stdenv.mkDerivation rec { name = "kodi-${version}"; version = "17.1"; @@ -92,8 +101,8 @@ in stdenv.mkDerivation rec { --replace "/bin/bash" "${bash}/bin/bash -ex" cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz - ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz - ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz + cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz + cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz ''; preConfigure = ''