Merge pull request #144462 from Artturin/shutterupda

This commit is contained in:
Sandro 2021-11-03 17:05:10 +01:00 committed by GitHub
commit ca6d7c54c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

@ -10,6 +10,7 @@
, procps
, libwnck
, libappindicator-gtk3
, xdg-utils
}:
let
@ -64,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "shutter";
version = "0.99";
version = "0.99.2";
src = fetchFromGitHub {
owner = "shutter-project";
repo = "shutter";
rev = "v${version}";
sha256 = "sha256-n5M+Ggk8ulJQMWjAW+/fC8fbqiBGzsx6IXlYxvf8utA=";
sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A=";
};
nativeBuildInputs = [ wrapGAppsHook ];
@ -81,6 +82,7 @@ stdenv.mkDerivation rec {
librsvg
libwnck
libappindicator-gtk3
hicolor-icon-theme
] ++ perlModules;
makeFlags = [
@ -94,9 +96,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--set PERL5LIB ${perlPackages.makePerlPath perlModules} \
--prefix PATH : ${lib.makeBinPath [ imagemagick ] } \
--suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
--set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE
--prefix PATH : ${lib.makeBinPath [ imagemagick xdg-utils ] }
)
'';

@ -9708,10 +9708,10 @@ let
Gtk3ImageView = buildPerlPackage rec {
pname = "Gtk3-ImageView";
version = "9";
version = "10";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz";
sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w=";
sha256 = "sha256-vHfnBgaeZPK7hBgZcP1KjepG+IvsDE3XwrH9U4xoN+Y=";
};
buildInputs = [ pkgs.gtk3 ];
propagatedBuildInputs = [ Readonly Gtk3 ];