diff options
author | goibhniu <cillian.deroiste@gmail.com> | 2015-10-24 18:01:42 +0200 |
---|---|---|
committer | goibhniu <cillian.deroiste@gmail.com> | 2015-10-24 18:01:42 +0200 |
commit | 352a4e4a7335d15a4f620c68f60d70464b94946b (patch) | |
tree | db397c5756aaf1d3db4ca5d631afe2a7ce957d58 /pkgs | |
parent | f93b52b8ae9af54489c7ccc1b0d6ae274740bedf (diff) | |
parent | c62f051e5a090ccaab03f2147541839dac718847 (diff) | |
download | nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar.gz nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar.bz2 nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar.lz nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar.xz nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.tar.zst nixlib-352a4e4a7335d15a4f620c68f60d70464b94946b.zip |
Merge pull request #10576 from simonvandel/tvheadend
tvheadend: 4.0.6 -> 4.0.7
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/tvheadend/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 79bade94569f..569eecd4f6e9 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,9 +1,9 @@ -{avahi, dbus, fetchurl, git, gzip, libav, libiconv, openssl, pkgconfig, python +{avahi, dbus, fetchurl, git, gnutar, gzip, libav, libiconv, openssl, pkgconfig, python , stdenv, which, zlib}: with stdenv.lib; -let version = "4.0.6"; +let version = "4.0.7"; pkgName = "tvheadend"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz"; - sha256 = "05jidg7jma3mban40iy1bg3sirw6crscxkd8b70if4kjlf86i31l"; + sha256 = "0vhj4vkgl4brjw1pdc80g1wbjn6hyy57jrxkwilnivqfd1mwx3aw"; }; enableParallelBuilding = true; @@ -22,10 +22,13 @@ stdenv.mkDerivation rec { # cannot happen during build. configureFlags = [ "--disable-dvbscan" ]; - buildInputs = [ avahi dbus git gzip libav libiconv openssl pkgconfig python + buildInputs = [ avahi dbus git gnutar gzip libav libiconv openssl pkgconfig python which zlib ]; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + patchShebangs ./configure + substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar + ''; meta = { description = "TV steaming server"; |