summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-05-01 14:27:56 +0200
committerGitHub <noreply@github.com>2017-05-01 14:27:56 +0200
commit69250aa4ee246b9657fdf8c48be2c55e7804ed88 (patch)
treedb59a595e08fc25455130f26b2ababc1bcf8f92a /pkgs/servers
parent49c419cf3eef64d4679a8503a5812e28e0ceb458 (diff)
parentb538448f399cb73500e82d155b647b0ea700e1ae (diff)
downloadnixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar.gz
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar.bz2
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar.lz
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar.xz
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.tar.zst
nixlib-69250aa4ee246b9657fdf8c48be2c55e7804ed88.zip
Merge pull request #25121 from simonvandel/tvheadend-421
tvheadend: 4.0.8 -> 4.2.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/tvheadend/default.nix20
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index b05977a1e25d..09cb2cca6288 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -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 = ''