diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-11 16:11:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 16:11:17 +0200 |
| commit | 58771c482c9ec51755c7b6e19630c27e83009e14 (patch) | |
| tree | b7286d3d7b731cdabb4e54fcbe3ab24836352773 | |
| parent | 29b415dcdb9bca8655f09f7fee46be268bb9af87 (diff) | |
| parent | 40d46f9ca4066ed52b023b2e9a5054aa68fcf097 (diff) | |
| download | nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar.gz nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar.bz2 nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar.lz nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar.xz nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.tar.zst nixpkgs-58771c482c9ec51755c7b6e19630c27e83009e14.zip | |
Merge pull request #24571 from jbgi/kodi-dvdfix
Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback)
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 9c421e0c828..10656af4ef4 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 = '' |