about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorHenner Zeller <h.zeller@acm.org>2022-01-08 12:10:41 -0800
committerHenner Zeller <h.zeller@acm.org>2022-01-08 12:12:40 -0800
commit9c51fce6a92a73517cedc58969239ddc726faf60 (patch)
tree225d501b46c47b15878164970bd88ff060e6f3df /pkgs/tools
parent32356ce11b8cc5cc421b68138ae8c730cc8ad4a2 (diff)
timg: 1.4.2 -> 1.4.3
Update version. Also include openslide support. The needed
dependency library became available since last release thanks
to @lromor.

Signed-off-by: Henner Zeller <h.zeller@acm.org>
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/graphics/timg/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix
index 7c2d004144dc4..035bb33eebf16 100644
--- a/pkgs/tools/graphics/timg/default.nix
+++ b/pkgs/tools/graphics/timg/default.nix
@@ -1,18 +1,18 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg
-, ffmpeg, zlib, libexif }:
+, ffmpeg, zlib, libexif, openslide }:
 
 stdenv.mkDerivation rec {
   pname = "timg";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "timg";
     rev = "v${version}";
-    sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149";
+    sha256 = "1lanr2y9rchl0xmycsyl0bhnh9mrmr5dj46pglw4lykz4rxslzcx";
   };
 
-  buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ];
+  buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ];
 
   nativeBuildInputs = [ cmake pkg-config ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DTIMG_VERSION_FROM_GIT=Off"
     "-DWITH_VIDEO_DECODING=On"
     "-DWITH_VIDEO_DEVICE=On"
-    "-DWITH_OPENSLIDE_SUPPORT=Off" # https://openslide.org/ lib not yet in nix
+    "-DWITH_OPENSLIDE_SUPPORT=On"
   ];
 
   meta = with lib; {