about summary refs log tree commit diff
path: root/pkgs/applications/video/kodi
diff options
context:
space:
mode:
authorSamuel Leathers <sam@appliedtrust.com>2017-09-22 19:57:26 -0400
committerRobin Gloster <mail@glob.in>2017-09-23 16:59:45 +0200
commit694e7e08d65d6d66b5e50a02c7a329ecec598f3c (patch)
treee428ee294836b0457863ba83dabdd5f65d0a5cf3 /pkgs/applications/video/kodi
parent99f759de1c6c943fd747afd8fb896a0d65ae4ed8 (diff)
downloadnixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar.gz
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar.bz2
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar.lz
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar.xz
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.tar.zst
nixlib-694e7e08d65d6d66b5e50a02c7a329ecec598f3c.zip
kodi: 17.3 -> 17.4
Diffstat (limited to 'pkgs/applications/video/kodi')
-rw-r--r--pkgs/applications/video/kodi/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 09cdf20ace0b..5a64c36abe4f 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -38,10 +38,11 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
+  kodi_version = "17.4";
   rel = "Krypton";
-  ffmpeg_3_1_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
-    sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
+  ffmpeg_3_1_9 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/3.1.9-${rel}-${kodi_version}.tar.gz";
+    sha256 = "0rhjz505ljfg2jqbm3rd7qbcjq4vnp8h9a8vad8rjf84v3alglpa";
   };
   # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
   libdvdnav_src = fetchurl {
@@ -53,12 +54,12 @@ let
     sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
   };
 in stdenv.mkDerivation rec {
+    version = kodi_version;
     name = "kodi-${version}";
-    version = "17.3";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "189isc1jagrnq549vwpvb0x1w6p0mkjwv7phm8dzvki96wx6bs0x";
+      sha256 = "1p1lxkapynjbd85ns7m4jybl4k35kxzv7105xkh03hlz8kkqc23b";
     };
 
     buildInputs = [
@@ -101,7 +102,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
+      cp ${ffmpeg_3_1_9} tools/depends/target/ffmpeg/ffmpeg-3.1.9-${rel}-${version}.tar.gz
       ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-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