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

youtube-dl: remove unnecessary pandoc dependency

Browse Source
This commit is contained in:
Michael Phillips 2015-06-04 22:57:40 -05:00 committed by Peter Simons
parent 6d42d6928e
commit 86a511a398
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,4 +1,9 @@
{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: { manuals ? true
, stdenv, fetchurl, makeWrapper, python, zip,
pandoc ? null
, ffmpeg }:
assert manuals -> pandoc != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "youtube-dl-${version}"; name = "youtube-dl-${version}";
@ -9,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
}; };
nativeBuildInputs = [ pandoc ]; nativeBuildInputs = [ ]
++ stdenv.lib.optional manuals pandoc;
buildInputs = [ python makeWrapper zip ]; buildInputs = [ python makeWrapper zip ];

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

@ -3384,7 +3384,9 @@ 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 { }; youtube-dl = callPackage ../tools/misc/youtube-dl {
manuals = false;
};
zbar = callPackage ../tools/graphics/zbar { zbar = callPackage ../tools/graphics/zbar {
pygtk = lib.overrideDerivation pygtk (x: { pygtk = lib.overrideDerivation pygtk (x: {