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

Merge pull request #33767 from corngood/youtube-dl-darwin 

youtube-dl: disable phantomjs support on darwin by default
This commit is contained in:
Jörg Thalheim 2018-01-13 16:57:01 +00:00 committed by GitHub
parent 3d7054964f 42d5dd68f8
commit cd960896d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPythonApplication { stdenv, targetPlatform, fetchurl, buildPythonApplication
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
# Pandoc is required to build the package's man page. Release tarballs contain a # 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 # formatted man page already, though, it will still be installed. We keep the
@ -8,7 +8,7 @@
, generateManPage ? false , generateManPage ? false
, ffmpegSupport ? true , ffmpegSupport ? true
, rtmpSupport ? true , rtmpSupport ? true
, phantomjsSupport ? true , phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin
, hlsEncryptedSupport ? true , hlsEncryptedSupport ? true
, makeWrapper }: , makeWrapper }: