diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-09-07 21:22:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 21:22:37 +0200 |
| commit | 89ef631ab9c8340eef83219fd41a5419d3268849 (patch) | |
| tree | ea9fbf505321d45f44fbcf51935bc93effca0199 | |
| parent | af8125c46f51ea0c15e50c994216ed1c428ba7bf (diff) | |
| parent | 8ef940a038c9a4bbd020f164c33a78385867dbfa (diff) | |
| download | nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar.gz nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar.bz2 nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar.lz nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar.xz nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.tar.zst nixlib-89ef631ab9c8340eef83219fd41a5419d3268849.zip | |
Merge pull request #46332 from timokau/youtube-dl-fix
youtube-dl: 2018.08.28 -> 2018.09.01, fix youtube download
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ed8f3bfd71b..e497f2a698c7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -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; |