Merge pull request #144462 from Artturin/shutterupda

authored by

Sandro and committed by
GitHub
ca6d7c54 fd5bc0b2

+7 -7
+5 -5
pkgs/applications/graphics/shutter/default.nix
··· 10 , procps 11 , libwnck 12 , libappindicator-gtk3 13 }: 14 15 let ··· 64 in 65 stdenv.mkDerivation rec { 66 pname = "shutter"; 67 - version = "0.99"; 68 69 src = fetchFromGitHub { 70 owner = "shutter-project"; 71 repo = "shutter"; 72 rev = "v${version}"; 73 - sha256 = "sha256-n5M+Ggk8ulJQMWjAW+/fC8fbqiBGzsx6IXlYxvf8utA="; 74 }; 75 76 nativeBuildInputs = [ wrapGAppsHook ]; ··· 81 librsvg 82 libwnck 83 libappindicator-gtk3 84 ] ++ perlModules; 85 86 makeFlags = [ ··· 94 preFixup = '' 95 gappsWrapperArgs+=( 96 --set PERL5LIB ${perlPackages.makePerlPath perlModules} \ 97 - --prefix PATH : ${lib.makeBinPath [ imagemagick ] } \ 98 - --suffix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ 99 - --set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE 100 ) 101 ''; 102
··· 10 , procps 11 , libwnck 12 , libappindicator-gtk3 13 + , xdg-utils 14 }: 15 16 let ··· 65 in 66 stdenv.mkDerivation rec { 67 pname = "shutter"; 68 + version = "0.99.2"; 69 70 src = fetchFromGitHub { 71 owner = "shutter-project"; 72 repo = "shutter"; 73 rev = "v${version}"; 74 + sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A="; 75 }; 76 77 nativeBuildInputs = [ wrapGAppsHook ]; ··· 82 librsvg 83 libwnck 84 libappindicator-gtk3 85 + hicolor-icon-theme 86 ] ++ perlModules; 87 88 makeFlags = [ ··· 96 preFixup = '' 97 gappsWrapperArgs+=( 98 --set PERL5LIB ${perlPackages.makePerlPath perlModules} \ 99 + --prefix PATH : ${lib.makeBinPath [ imagemagick xdg-utils ] } 100 ) 101 ''; 102
+2 -2
pkgs/top-level/perl-packages.nix
··· 9708 9709 Gtk3ImageView = buildPerlPackage rec { 9710 pname = "Gtk3-ImageView"; 9711 - version = "9"; 9712 src = fetchurl { 9713 url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz"; 9714 - sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w="; 9715 }; 9716 buildInputs = [ pkgs.gtk3 ]; 9717 propagatedBuildInputs = [ Readonly Gtk3 ];
··· 9708 9709 Gtk3ImageView = buildPerlPackage rec { 9710 pname = "Gtk3-ImageView"; 9711 + version = "10"; 9712 src = fetchurl { 9713 url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz"; 9714 + sha256 = "sha256-vHfnBgaeZPK7hBgZcP1KjepG+IvsDE3XwrH9U4xoN+Y="; 9715 }; 9716 buildInputs = [ pkgs.gtk3 ]; 9717 propagatedBuildInputs = [ Readonly Gtk3 ];