mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Merge branch 'youtube-dl' of https://github.com/KaiSforza/nixpkgs
This commit is contained in:
commit
1cc999e09d
@ -1,4 +1,5 @@
|
|||||||
{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }:
|
{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg
|
||||||
|
, pandoc ? null }:
|
||||||
|
|
||||||
# Pandoc is required to build the package's man page. Release tarballs
|
# 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
|
# contain a formatted man page already, though, so it's fine to pass
|
||||||
@ -7,7 +8,7 @@
|
|||||||
# case someone wants to use this derivation to build a Git version of
|
# case someone wants to use this derivation to build a Git version of
|
||||||
# the tool that doesn't have the formatted man page included.
|
# the tool that doesn't have the formatted man page included.
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
buildPythonPackage rec {
|
||||||
name = "youtube-dl-${version}";
|
name = "youtube-dl-${version}";
|
||||||
version = "2015.05.29";
|
version = "2015.05.29";
|
||||||
|
|
||||||
@ -16,18 +17,11 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
|
sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ python makeWrapper zip pandoc ];
|
buildInputs = [ makeWrapper zip pandoc ];
|
||||||
|
|
||||||
patchPhase = "rm youtube-dl";
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
|
# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
|
||||||
postInstall = ''
|
postInstall = stdenv.lib.optionalString (ffmpeg != null)
|
||||||
wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"
|
''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = "http://rg3.github.com/youtube-dl/";
|
homepage = "http://rg3.github.com/youtube-dl/";
|
||||||
|
@ -3398,12 +3398,6 @@ let
|
|||||||
# To expose more packages for Yi, override the extraPackages arg.
|
# To expose more packages for Yi, override the extraPackages arg.
|
||||||
yi = callPackage ../applications/editors/yi/wrapper.nix { };
|
yi = callPackage ../applications/editors/yi/wrapper.nix { };
|
||||||
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
zbar = callPackage ../tools/graphics/zbar {
|
zbar = callPackage ../tools/graphics/zbar {
|
||||||
pygtk = lib.overrideDerivation pygtk (x: {
|
pygtk = lib.overrideDerivation pygtk (x: {
|
||||||
gtk = gtk2;
|
gtk = gtk2;
|
||||||
@ -14796,6 +14790,7 @@ let
|
|||||||
lttngUst = lttng-ust; # added 2014-07-31
|
lttngUst = lttng-ust; # added 2014-07-31
|
||||||
jquery_ui = jquery-ui; # added 2014-09-07
|
jquery_ui = jquery-ui; # added 2014-09-07
|
||||||
youtubeDL = youtube-dl; # added 2014-10-26
|
youtubeDL = youtube-dl; # added 2014-10-26
|
||||||
|
youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
|
||||||
rdiff_backup = rdiff-backup; # added 2014-11-23
|
rdiff_backup = rdiff-backup; # added 2014-11-23
|
||||||
htmlTidy = html-tidy; # added 2014-12-06
|
htmlTidy = html-tidy; # added 2014-12-06
|
||||||
libtidy = html-tidy; # added 2014-12-21
|
libtidy = html-tidy; # added 2014-12-21
|
||||||
|
@ -13533,6 +13533,19 @@ let
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
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-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;
|
||||||
|
};
|
||||||
|
|
||||||
zbase32 = buildPythonPackage (rec {
|
zbase32 = buildPythonPackage (rec {
|
||||||
name = "zbase32-1.1.2";
|
name = "zbase32-1.1.2";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user