diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2016-02-21 15:31:41 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-02-21 15:32:12 +0100 |
| commit | ad4bfe4dda80815c2d02016623cc48df7a5ed8ca (patch) | |
| tree | d66d50231e4a1c8f31288e576b1873be44f6955b /pkgs | |
| parent | 8968a6e60476fd5160ee450e4ea7f9d69877fd8d (diff) | |
| download | nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar.gz nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar.bz2 nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar.lz nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar.xz nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.tar.zst nixlib-ad4bfe4dda80815c2d02016623cc48df7a5ed8ca.zip | |
kodi: 15.2 -> 16.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index e1dc182ba0b9..5761a443df8a 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -15,7 +15,8 @@ , lzo, libcdio, libmodplug, libass, libbluray , sqlite, mysql, nasm, gnutls, libva, wayland , curl, bzip2, zip, unzip, glxinfo, xdpyinfo -, libcec, libcec_platform +, libcec, libcec_platform, dcadec, libuuid +, libcrossguid , dbus_libs ? null, dbusSupport ? true , udev, udevSupport ? true , libusb ? null, usbSupport ? false @@ -36,18 +37,18 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; let - rel = "Isengard"; - ffmpeg_2_6_4 = fetchurl { - url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz"; - sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4"; + rel = "Jarvis"; + ffmpeg_2_8_6 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz"; + sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh"; }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "15.2"; + version = "16.0"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx"; + sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884"; }; buildInputs = [ @@ -68,7 +69,8 @@ in stdenv.mkDerivation rec { lzo libcdio libmodplug libass libbluray sqlite mysql.lib nasm avahi libdvdcss lame curl bzip2 zip unzip glxinfo xdpyinfo - libcec libcec_platform + libcec libcec_platform dcadec libuuid + libcrossguid ] ++ lib.optional dbusSupport dbus_libs ++ lib.optional udevSupport udev @@ -85,7 +87,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_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz + cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz ''; preConfigure = '' |