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

youtube-dl: use toPythonApplication (#40831)

Browse Source
This commit is contained in:
Robert Schütz 2018-05-22 11:01:55 +02:00 committed by GitHub
parent 561a1f177a
commit 57d591ec7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 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, targetPlatform, fetchurl, buildPythonApplication
{ stdenv, targetPlatform, fetchurl, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
# 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
@ -13,7 +13,7 @@
, makeWrapper }:
with stdenv.lib;
buildPythonApplication rec {
buildPythonPackage rec {
pname = "youtube-dl";
version = "2018.05.18";

6
pkgs/top-level/all-packages.nix
View File

@ -15089,7 +15089,6 @@ with pkgs;
bombono = callPackage ../applications/video/bombono {};
bomi = libsForQt5.callPackage ../applications/video/bomi {
youtube-dl = pythonPackages.youtube-dl;
pulseSupport = config.pulseaudio or true;
ffmpeg = ffmpeg_2;
};
@ -17045,7 +17044,6 @@ with pkgs;
mpv = callPackage ../applications/video/mpv rec {
inherit (luaPackages) luasocket;
youtube-dl = pythonPackages.youtube-dl;
waylandSupport = stdenv.isLinux;
alsaSupport = !stdenv.isDarwin;
pulseSupport = !stdenv.isDarwin;
@ -18970,7 +18968,9 @@ with pkgs;
yoshimi = callPackage ../applications/audio/yoshimi { };
inherit (pythonPackages) youtube-dl;
youtube-dl = with pythonPackages; toPythonApplication youtube-dl;
youtube-dl-light = with pythonPackages; toPythonApplication youtube-dl-light;
youtube-viewer = perlPackages.WWWYoutubeViewer;