diff options
Diffstat (limited to 'pkgs/tools/graphics/fgallery/default.nix')
| -rw-r--r-- | pkgs/tools/graphics/fgallery/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 4b263b555d21..424cf5c1bdc6 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool, JSON -, coreutils, zip, imagemagick, pngcrush, lcms2, fbida -}: +{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool +, 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"; + name = "fgallery-1.8.2"; src = fetchurl { url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; - sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d"; + sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ]; + buildInputs = [ unzip makeWrapper perl ImageExifTool CpanelJSONXS ]; installPhase = '' mkdir -p "$out/bin" @@ -35,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; { |