Merge pull request #25121 from simonvandel/tvheadend-421

tvheadend: 4.0.8 -> 4.2.1
This commit is contained in:
Michael Raskin 2017-05-01 14:27:56 +02:00 committed by GitHub
commit 69250aa4ee

View File

@ -1,9 +1,9 @@
{avahi, dbus, fetchurl, git, gnutar, gzip, libav, libiconv, openssl, pkgconfig, python
{avahi, cmake, dbus, fetchurl, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, pkgconfig, python
, stdenv, which, zlib}:
with stdenv.lib;
let version = "4.0.8";
let version = "4.2.1";
pkgName = "tvheadend";
in
@ -13,16 +13,26 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz";
sha256 = "0k4g7pvfyk4bxpsjdwv7bmbygbp7gfg9wrr2aqb099ncbz18bx04";
sha256 = "1wrj3w595c1hfl2vmfdmp5qncy5samqi7iisyq76jf3nlzgw6dvn";
};
enableParallelBuilding = true;
# disable dvbscan, as having it enabled causes a network download which
# cannot happen during build.
configureFlags = [ "--disable-dvbscan" ];
configureFlags = [
"--disable-dvbscan"
"--disable-bintray_cache"
"--disable-ffmpeg_static"
"--disable-hdhomerun_client"
"--disable-hdhomerun_static"
];
buildInputs = [ avahi dbus git gnutar gzip libav libiconv openssl pkgconfig python
buildPhase = "make";
dontUseCmakeConfigure = true;
buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl pkgconfig python
which zlib ];
preConfigure = ''