diff options
Diffstat (limited to 'pkgs/applications/video/kodi/default.nix')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 792cb67f81240..bb3aeed26ca85 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -7,7 +7,7 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, SDL, SDL_image, SDL_mixer, alsaLib +, SDL, SDL2, SDL_image, SDL_mixer, alsaLib , mesa, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad @@ -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 @@ -25,6 +26,7 @@ , rtmpdump ? null, rtmpSupport ? true , libvdpau ? null, vdpauSupport ? true , libpulseaudio ? null, pulseSupport ? true +, joystickSupport ? true }: assert dbusSupport -> dbus_libs != null; @@ -36,18 +38,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 +70,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 @@ -76,7 +79,9 @@ in stdenv.mkDerivation rec { ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional rtmpSupport rtmpdump; + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional joystickSupport SDL2; + dontUseCmakeConfigure = true; @@ -85,7 +90,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 = '' @@ -96,7 +101,8 @@ in stdenv.mkDerivation rec { ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" ++ lib.optional pulseSupport "--enable-pulse" - ++ lib.optional rtmpSupport "--enable-rtmp"; + ++ lib.optional rtmpSupport "--enable-rtmp" + ++ lib.optional joystickSupport "--enable-joystick"; postInstall = '' for p in $(ls $out/bin/) ; do @@ -105,9 +111,8 @@ in stdenv.mkDerivation rec { --prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump ] + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ] }" - --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \ done ''; |