Merge pull request #132565 from Artturin/shutter
This commit is contained in:
commit
3a0047ac27
|
@ -1,39 +1,103 @@
|
||||||
{ lib, stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg
|
{ lib
|
||||||
, hicolor-icon-theme, procps
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, perlPackages
|
||||||
|
, wrapGAppsHook
|
||||||
|
, imagemagick
|
||||||
|
, gdk-pixbuf
|
||||||
|
, librsvg
|
||||||
|
, hicolor-icon-theme
|
||||||
|
, procps
|
||||||
|
, libwnck
|
||||||
|
, libappindicator-gtk3
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
perlModules = with perlPackages;
|
perlModules = with perlPackages; [
|
||||||
[ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
|
# Not sure if these are needed
|
||||||
Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
|
# Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique
|
||||||
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
|
ImageMagick
|
||||||
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
|
Cairo
|
||||||
ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
|
FileBaseDir
|
||||||
commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
|
FileWhich
|
||||||
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
|
FileCopyRecursive
|
||||||
|
XMLSimple
|
||||||
|
XMLTwig
|
||||||
|
XMLParser
|
||||||
|
SortNaturally
|
||||||
|
LocaleGettext
|
||||||
|
ProcProcessTable
|
||||||
|
X11Protocol
|
||||||
|
ProcSimple
|
||||||
|
ImageExifTool
|
||||||
|
JSON
|
||||||
|
JSONMaybeXS
|
||||||
|
NetOAuth
|
||||||
|
PathClass
|
||||||
|
LWP
|
||||||
|
LWPProtocolHttps
|
||||||
|
NetDBus
|
||||||
|
TryTiny
|
||||||
|
WWWMechanize
|
||||||
|
HTTPMessage
|
||||||
|
HTTPDate
|
||||||
|
HTMLForm
|
||||||
|
HTMLParser
|
||||||
|
HTMLTagset
|
||||||
|
HTTPCookies
|
||||||
|
EncodeLocale
|
||||||
|
URI
|
||||||
|
CarpAlways
|
||||||
|
GlibObjectIntrospection
|
||||||
|
NumberBytesHuman
|
||||||
|
CairoGObject
|
||||||
|
Readonly
|
||||||
|
Gtk3ImageView
|
||||||
|
Gtk3
|
||||||
|
Glib
|
||||||
|
Pango
|
||||||
|
GooCanvas2
|
||||||
|
GooCanvas2CairoTypes
|
||||||
|
commonsense
|
||||||
|
TypesSerialiser
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "shutter-0.94.3";
|
pname = "shutter";
|
||||||
|
version = "0.97";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://launchpad.net/shutter/0.9x/0.94.3/+download/shutter-0.94.3.tar.gz";
|
owner = "shutter-project";
|
||||||
sha256 = "01wv5k6zqfqa2rss461lpdpjxpfk4awzfdc6j2qk6bh4g4zgmgl5";
|
repo = "shutter";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-/2eQLJJZP0ArQUrxcFdogv/4wy+O021hODkJYLQmLY8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ wrapGAppsHook ];
|
||||||
buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules;
|
buildInputs = [
|
||||||
|
perlPackages.perl
|
||||||
|
procps
|
||||||
|
gdk-pixbuf
|
||||||
|
librsvg
|
||||||
|
libwnck
|
||||||
|
libappindicator-gtk3
|
||||||
|
] ++ perlModules;
|
||||||
|
|
||||||
installPhase = ''
|
makeFlags = [
|
||||||
mkdir -p "$out"
|
"prefix=${placeholder "out"}"
|
||||||
cp -a . "$out"
|
];
|
||||||
(cd "$out" && mv CHANGES README COPYING "$out/share/doc/shutter")
|
|
||||||
|
|
||||||
wrapProgram $out/bin/shutter \
|
postPatch = ''
|
||||||
--set PERL5LIB "${perlPackages.makePerlPath perlModules}" \
|
patchShebangs po2mo.sh
|
||||||
--prefix PATH : "${imagemagick.out}/bin" \
|
'';
|
||||||
--suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
|
|
||||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
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
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -9008,6 +9008,20 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
GooCanvas2CairoTypes = buildPerlPackage rec {
|
||||||
|
pname = "GooCanvas2-CairoTypes";
|
||||||
|
version = "0.001";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-${version}.tar.gz";
|
||||||
|
sha256 = "sha256-uoBnNuvMnePYFBp2Omgr3quxy4cCveKZrf1XSs6HUFI=";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ];
|
||||||
|
meta = {
|
||||||
|
description = "Bridge between GooCanvas2 and Cairo types";
|
||||||
|
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
GoogleProtocolBuffers = buildPerlPackage {
|
GoogleProtocolBuffers = buildPerlPackage {
|
||||||
pname = "Google-ProtocolBuffers";
|
pname = "Google-ProtocolBuffers";
|
||||||
version = "0.12";
|
version = "0.12";
|
||||||
|
@ -9237,16 +9251,16 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
Gtk3ImageView = buildPerlPackage {
|
Gtk3ImageView = buildPerlPackage rec {
|
||||||
pname = "Gtk3-ImageView";
|
pname = "Gtk3-ImageView";
|
||||||
version = "6";
|
version = "9";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz";
|
url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz";
|
||||||
sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0";
|
sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w=";
|
||||||
};
|
};
|
||||||
buildInputs = [ pkgs.gtk3 ];
|
buildInputs = [ pkgs.gtk3 ];
|
||||||
propagatedBuildInputs = [ Readonly Gtk3 ];
|
propagatedBuildInputs = [ Readonly Gtk3 ];
|
||||||
checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
|
checkInputs = [ TestDifferences TestDeep ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
|
${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
|
||||||
make test
|
make test
|
||||||
|
|
Loading…
Reference in a new issue