BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

youtube-dl: wrap with atomicparsley (#18066)

Browse source 
Otherwise --embed-thumbnail will crash youtube-dl while running.
Rewrite the module arguments to be semantic and not fail with null
pointer errors.
This commit is contained in:
Profpatsch 2016-08-30 14:36:16 +02:00 committed by Franz Pletz
parent f254db331e
commit e1e96a8210
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/tools/misc/youtube-dl/default.nix
View file

@ -1,13 +1,15 @@
{ stdenv, fetchurl, buildPythonApplication, makeWrapper, ffmpeg, zip
, pandoc ? null
{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, pandoc
, atomicparsley
# 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
# build a Git version of the tool that doesn't have the formatted man page
# included.
, generateManPage ? false
, ffmpegSupport ? true
}:
# Pandoc is required to build the package's man page. Release tarballs
# contain a formatted man page already, though, so it's fine to pass
# "pandoc = null" to this derivation; the man page will still be
# installed. We keep the pandoc argument and build input in place in
# case someone wants to use this derivation to build a Git version of
# the tool that doesn't have the formatted man page included.
with stdenv.lib;
buildPythonApplication rec {
@ -19,16 +21,20 @@ buildPythonApplication rec {
sha256 = "017x2hqc2bacypjmn9ac9f91y9y6afydl0z7dich5l627494hvfg";
};
buildInputs = [ makeWrapper zip pandoc ];
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
postInstall = stdenv.lib.optionalString (ffmpeg != null)
''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg.bin}/bin"'';
# atomicparsley for embedding thumbnails
postInstall = let
packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg;
in ''
wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}"
'';
# Requires network
doCheck = false;
meta = with stdenv.lib; {
meta = {
homepage = http://rg3.github.io/youtube-dl/;
repositories.git = https://github.com/rg3/youtube-dl.git;
description = "Command-line tool to download videos from YouTube.com and other sites";

11
pkgs/top-level/python-packages.nix
View file

@ -25188,17 +25188,10 @@ in modules // {
};
};
youtube-dl = callPackage ../tools/misc/youtube-dl {
# Release versions don't need pandoc because the formatted man page
# is included in the tarball.
pandoc = null;
};
youtube-dl = callPackage ../tools/misc/youtube-dl {};
youtube-dl-light = callPackage ../tools/misc/youtube-dl {
# Release versions don't need pandoc because the formatted man page
# is included in the tarball.
ffmpeg = null;
pandoc = null;
ffmpegSupport = false;
};
zbase32 = buildPythonPackage (rec {