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

Merge pull request #46332 from timokau/youtube-dl-fix

Browse Source 
youtube-dl:  2018.08.28 -> 2018.09.01, fix youtube download
This commit is contained in:
Timo Kaufmann 2018-09-07 21:22:37 +02:00 committed by GitHub
commit 89ef631ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,5 +1,6 @@
{ lib, fetchurl, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
, fetchpatch
# Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the
# manpage argument in place in case someone wants to use this derivation to
@ -15,13 +16,22 @@
buildPythonPackage rec {
pname = "youtube-dl";
version = "2018.08.28";
version = "2018.09.01";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi";
sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036";
};
patches = [
# https://github.com/rg3/youtube-dl/pull/17464
(fetchpatch {
name = "youtube-js-player-fix.patch";
url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch";
sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg";
})
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;