Upgrade rtmpdump and get_iplayer
This commit is contained in:
parent
366e3bd7a1
commit
31428612c2
@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
|
||||
buildPerlPackage {
|
||||
name = "get_iplayer-2.83";
|
||||
name = "get_iplayer-2.86";
|
||||
|
||||
buildInputs = [makeWrapper perl];
|
||||
propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
|
||||
@ -12,12 +12,12 @@ buildPerlPackage {
|
||||
mkdir -p $out/bin
|
||||
cp get_iplayer $out/bin
|
||||
sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
|
||||
wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin
|
||||
wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz;
|
||||
sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga";
|
||||
url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz;
|
||||
sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1";
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -4,8 +4,8 @@ stdenv.mkDerivation {
|
||||
name = "rtmpdump-2.4";
|
||||
src = fetchgit {
|
||||
url = git://git.ffmpeg.org/rtmpdump;
|
||||
rev = "c28f1bab7822de97353849e7787b59e50bbb1428";
|
||||
sha256 = "927e7ea7a686adb7cbce9d0a0c710de1e0921bbb1f0c1b35d17bdb816e6c73d8";
|
||||
rev = "79459a2b43f41ac44a2ec001139bcb7b1b8f7497";
|
||||
sha256 = "5af22362004566794035f989879b13d721f85d313d752abd10a7e45806e3944c";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib gnutls libgcrypt ];
|
||||
|
@ -1826,9 +1826,7 @@ let
|
||||
|
||||
privateer = callPackage ../games/privateer { };
|
||||
|
||||
rtmpdump = callPackage ../tools/video/rtmpdump {
|
||||
gnutls = gnutls31; # gnutls32: undefined reference to gnutls_calc_dh_{key,secret}
|
||||
};
|
||||
rtmpdump = callPackage ../tools/video/rtmpdump { };
|
||||
|
||||
reaverwps = callPackage ../tools/networking/reaver-wps {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user