diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-03-22 14:16:39 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-03-24 08:19:16 +0800 |
commit | 7833436098a341c1296faba17a7839690aa0702a (patch) | |
tree | fa0ed57236546e851c86d7fe8b08c5a4068a91d6 /pkgs | |
parent | f45cf10f6e0468b12c4a3c1391460c3d348a2fda (diff) | |
download | nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar.gz nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar.bz2 nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar.lz nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar.xz nixpkgs-7833436098a341c1296faba17a7839690aa0702a.tar.zst nixpkgs-7833436098a341c1296faba17a7839690aa0702a.zip |
kodi: 17.0 -> 17.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d7625b8ebac..9c421e0c828 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -44,12 +44,12 @@ let sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; in stdenv.mkDerivation rec { - name = "kodi-" + version; - version = "17.0"; + name = "kodi-${version}"; + version = "17.1"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb"; + sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh"; }; buildInputs = [ @@ -97,9 +97,18 @@ in stdenv.mkDerivation rec { ''; preConfigure = '' + patchShebangs . ./bootstrap + # tests here fail + sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt} + # tests here trigger a segfault in kodi.bin + sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt} ''; + enableParallelBuild = true; + + doCheck = true; + configureFlags = [ "--enable-libcec" ] ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" @@ -110,19 +119,17 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${python2}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ + --prefix PATH ":" "${lib.makeBinPath + [ python2 glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ] - }" + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}" done ''; meta = with stdenv.lib; { homepage = http://kodi.tv/; description = "Media center"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar titanous edwtjo ]; }; |