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

fgallery: 1.8 -> 1.8.2

Browse Source
This commit is contained in:
Robert Helgesson 2017-07-29 16:19:09 +02:00
parent 1ae9848fe1
commit 138dd4f9f1
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/graphics/fgallery/default.nix
View File

@ -1,6 +1,5 @@
{ 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, fbida }:
# TODO: add optional dependencies (snippet from fgallery source):
#
@ -11,14 +10,14 @@
# 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"

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

@ -1911,7 +1911,7 @@ with pkgs;
ferm = callPackage ../tools/networking/ferm { };
fgallery = callPackage ../tools/graphics/fgallery {
inherit (perlPackages) ImageExifTool JSON;
inherit (perlPackages) ImageExifTool CpanelJSONXS;
};
flannel = callPackage ../tools/networking/flannel { };