summary refs log tree commit diff
path: root/pkgs/tools/graphics/fgallery
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2017-07-29 16:22:54 +0200
committerRobert Helgesson <robert@rycee.net>2017-07-29 17:01:54 +0200
commit9d4d62923ae10de107a4e0693aa859c80710bb7b (patch)
tree14b762e7641d5ad47cd66e3993473fed80c2c352 /pkgs/tools/graphics/fgallery
parent138dd4f9f194936fbeed67467124caa5de04fcf4 (diff)
downloadnixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar.gz
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar.bz2
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar.lz
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar.xz
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.tar.zst
nixpkgs-9d4d62923ae10de107a4e0693aa859c80710bb7b.zip
fgallery: add support for facedetect
Diffstat (limited to 'pkgs/tools/graphics/fgallery')
-rw-r--r--pkgs/tools/graphics/fgallery/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 439a01584c3..424cf5c1bdc 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; {