From 86a511a398d83a2e5374e8e8d6f9c64f38f6e5b3 Mon Sep 17 00:00:00 2001 From: Michael Phillips Date: Thu, 4 Jun 2015 22:57:40 -0500 Subject: [PATCH] youtube-dl: remove unnecessary pandoc dependency --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a513cdaecec..18d6df1e2727 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -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 { name = "youtube-dl-${version}"; @@ -9,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ ] + ++ stdenv.lib.optional manuals pandoc; buildInputs = [ python makeWrapper zip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b54674cb656..024f9cf7bcf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3384,7 +3384,9 @@ let # To expose more packages for Yi, override the extraPackages arg. 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 { pygtk = lib.overrideDerivation pygtk (x: {