diff options
| author | Benjamin Staffin <benley@gmail.com> | 2020-06-17 17:22:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:22:24 -0400 |
| commit | 19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch) | |
| tree | 455aed025973e748f264df336d5dc0e7ae40dad5 /pkgs/tools/misc/youtube-dl/default.nix | |
| parent | 13a14e2bfe4ff3b7da222624ce5749218105e465 (diff) | |
| parent | 19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff) | |
| download | nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2 nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip | |
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'pkgs/tools/misc/youtube-dl/default.nix')
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9e28e8785732..94f4de6e364f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, zip, ffmpeg_4, 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 # 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 @@ -36,7 +36,7 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; |