public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade rtmpdump and get_iplayer

Browse Source
This commit is contained in:
Rob Vermaas 2014-05-07 20:55:21 +02:00
parent 366e3bd7a1
commit 31428612c2
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
buildPerlPackage { buildPerlPackage {
name = "get_iplayer-2.83"; name = "get_iplayer-2.86";
buildInputs = [makeWrapper perl]; buildInputs = [makeWrapper perl];
propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP]; propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
@ -12,12 +12,12 @@ buildPerlPackage {
mkdir -p $out/bin mkdir -p $out/bin
cp get_iplayer $out/bin cp get_iplayer $out/bin
sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer 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 { src = fetchurl {
url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz; url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz;
sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga"; sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1";
}; };
} }

4
pkgs/tools/video/rtmpdump/default.nix
View File

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "rtmpdump-2.4"; name = "rtmpdump-2.4";
src = fetchgit { src = fetchgit {
url = git://git.ffmpeg.org/rtmpdump; url = git://git.ffmpeg.org/rtmpdump;
rev = "c28f1bab7822de97353849e7787b59e50bbb1428"; rev = "79459a2b43f41ac44a2ec001139bcb7b1b8f7497";
sha256 = "927e7ea7a686adb7cbce9d0a0c710de1e0921bbb1f0c1b35d17bdb816e6c73d8"; sha256 = "5af22362004566794035f989879b13d721f85d313d752abd10a7e45806e3944c";
}; };
buildInputs = [ zlib gnutls libgcrypt ]; buildInputs = [ zlib gnutls libgcrypt ];

4
pkgs/top-level/all-packages.nix
View File

@ -1826,9 +1826,7 @@ let
privateer = callPackage ../games/privateer { }; privateer = callPackage ../games/privateer { };
rtmpdump = callPackage ../tools/video/rtmpdump { rtmpdump = callPackage ../tools/video/rtmpdump { };
gnutls = gnutls31; # gnutls32: undefined reference to gnutls_calc_dh_{key,secret}
};
reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps = callPackage ../tools/networking/reaver-wps {};