diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
| commit | 658b7c3f2ebb7d04d950b95ce81cd5fea2a03141 (patch) | |
| tree | fdcfa83f21b9c98315a3a751ef4d27772976589a /pkgs/tools/misc | |
| parent | f14841f3ce734b27988a605fc9775a035d313d23 (diff) | |
| parent | a2981671523416ad5c9a49de8c16ac8fccb2306b (diff) | |
| download | nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.gz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.bz2 nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.lz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.xz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.zst nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 19173de41e5f..b7e3116b672e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -8,7 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true -, phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin +, phantomjsSupport ? false , hlsEncryptedSupport ? true , makeWrapper }: |