From 9d4d62923ae10de107a4e0693aa859c80710bb7b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 29 Jul 2017 16:22:54 +0200 Subject: [PATCH] fgallery: add support for facedetect --- pkgs/tools/graphics/fgallery/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 439a01584c32..424cf5c1bdc6 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool -, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2, fbida }: +, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2 +, facedetect, fbida }: # TODO: add optional dependencies (snippet from fgallery source): # # if(system("jpegoptim -V >/dev/null 2>&1")) { # $jpegoptim = 0; # } -# if($facedet && system("facedetect -h >/dev/null 2>&1")) { -# fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { name = "fgallery-1.8.2"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ --set PATH "${stdenv.lib.makeBinPath - [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" + [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; meta = with stdenv.lib; {