diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-05-07 20:55:21 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-05-07 20:56:37 +0200 |
| commit | 31428612c231725671ee9cbbde58a3289eb0eac7 (patch) | |
| tree | e1db8a3f8ccee5c37dca5b2f2e5546e6e90c990f | |
| parent | 366e3bd7a1050654114d4410fd0ae0fd861e218d (diff) | |
| download | nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar.gz nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar.bz2 nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar.lz nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar.xz nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.tar.zst nixpkgs-31428612c231725671ee9cbbde58a3289eb0eac7.zip | |
Upgrade rtmpdump and get_iplayer
| -rw-r--r-- | pkgs/applications/misc/get_iplayer/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/video/rtmpdump/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 308b181fe88..08fad5a021d 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -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"; }; } diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 615f300aaf5..2034331c8e0 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd63a1a96d6..bd39b080d4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |