From 48497dbd25166da3a9a25d12da87a8c8a681169e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 11 Mar 2021 17:41:47 +0100 Subject: [PATCH] megapixels: 0.14.0 -> 0.15.0 --- pkgs/applications/graphics/megapixels/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 29aaed1278d..1a703378845 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -7,10 +7,11 @@ , wrapGAppsHook , gtk3 , gnome3 +, zbar , tiffSupport ? true , libraw , jpgSupport ? true -, imagemagick +, graphicsmagick , exiftool }: @@ -20,24 +21,24 @@ let inherit (lib) makeBinPath optional optionals optionalString; runtimePath = makeBinPath ( optional tiffSupport libraw - ++ optionals jpgSupport [ imagemagick exiftool ] + ++ optionals jpgSupport [ graphicsmagick exiftool ] ); in stdenv.mkDerivation rec { pname = "megapixels"; - version = "0.14.0"; + version = "0.15.0"; src = fetchgit { url = "https://git.sr.ht/~martijnbraam/megapixels"; rev = version; - sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw"; + sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ] + buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] ++ optional tiffSupport libraw - ++ optional jpgSupport imagemagick; + ++ optional jpgSupport graphicsmagick; preFixup = optionalString (tiffSupport || jpgSupport) '' gappsWrapperArgs+=(