summary refs log tree commit diff
path: root/pkgs/applications/video/kodi/default.nix
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2015-07-22 15:27:14 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2015-07-22 15:54:58 +0200
commit323fed4284407b72087fde94134e2892e3c5e31f (patch)
tree4f72117b61d4f68f49c4111d6cc96218e7dee3ae /pkgs/applications/video/kodi/default.nix
parent606d34e45aeedc843f0ddb375e1fb1aa9be429fd (diff)
downloadnixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar.gz
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar.bz2
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar.lz
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar.xz
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.tar.zst
nixpkgs-323fed4284407b72087fde94134e2892e3c5e31f.zip
kodi: 14.2 -> 15.0
Diffstat (limited to 'pkgs/applications/video/kodi/default.nix')
-rw-r--r--pkgs/applications/video/kodi/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index cd24f2bfc2a..30eac05c234 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -37,18 +37,18 @@ assert cecSupport   -> libcec != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Helix";
-  ffmpeg_2_4_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.4.6-${rel}.tar.gz";
-    sha256 = "1kxp2z2zgcbplm5398zrfgwcfacfzvbg9y9wwrmm8vgwfmj32wh8";
+  rel = "Isengard";
+  ffmpeg_2_6_3 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
+    sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "14.2";
+    version = "15.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr";
+      sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
     };
 
     buildInputs = [
@@ -86,7 +86,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_2_4_6} tools/depends/target/ffmpeg/ffmpeg-2.4.6-${rel}.tar.gz
+      cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
     '';
 
     preConfigure = ''