From 0ea42c7af6b7c8edbd8a9c0a040b2eef154b6d2b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 27 Nov 2019 13:03:23 -0500 Subject: tryton: 4.8.5 -> 5.4.0 Uses python3, no more pygtk. --- pkgs/applications/office/tryton/default.nix | 55 +++++++++++++++++++---------- 1 file changed, 37 insertions(+), 18 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 4422aaa2b44..971f2f645f8 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,5 +1,5 @@ { stdenv -, python2Packages +, python3Packages , pkgconfig , librsvg , gobject-introspection @@ -7,40 +7,59 @@ , gtk3 , gtkspell3 , gnome3 +, glib , goocanvas2 +, gdk-pixbuf +, pango +, fontconfig +, freetype +, wrapGAppsHook }: with stdenv.lib; -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "4.8.5"; - src = python2Packages.fetchPypi { + version = "5.4.0"; + + disabled = !python3Packages.isPy3k; + + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4"; + sha256 = "0wbq8y8z0n6c5b3h5ynlawn3z79a3hkb1fkmblz4pwnj0jfnbswd"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; - propagatedBuildInputs = with python2Packages; [ - chardet + + nativeBuildInputs = [ + pkgconfig + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ dateutil - pygtk - librsvg pygobject3 goocalendar - cdecimal + pycairo ]; + buildInputs = [ atk - gtk3 + gdk-pixbuf + glib gnome3.adwaita-icon-theme - gtkspell3 goocanvas2 + fontconfig + freetype + gtk3 + gtkspell3 + librsvg + pango ]; - makeWrapperArgs = [ - ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"'' - ''--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"'' - ''--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'' - ]; + + strictDeps = false; + + doCheck = false; + meta = { description = "The client of the Tryton application platform"; longDescription = '' -- cgit 1.4.1