From 9e8df69a9f0ab8c4b97d7e0132e45cd650cd8993 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 6 Dec 2021 09:26:23 +0200 Subject: [PATCH] escrotum: 2019-06-10 -> 2020-12-07 --- pkgs/tools/graphics/escrotum/default.nix | 29 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 6a0a2b2683d9..08136f57ef88 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -1,18 +1,35 @@ -{ lib, python2Packages, fetchFromGitHub +{ lib, python3Packages, fetchFromGitHub +, gtk3 +, pango +, gobject-introspection +, wrapGAppsHook }: -with python2Packages; buildPythonApplication { +with python3Packages; buildPythonApplication { pname = "escrotum"; - version = "unstable-2019-06-10"; + version = "unstable-2020-12-07"; src = fetchFromGitHub { owner = "Roger"; repo = "escrotum"; - rev = "f6c300315cb4402e37f16b56aad2d206e24c5281"; - sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0"; + rev = "a41d0f11bb6af4f08e724b8ccddf8513d905c0d1"; + sha256 = "sha256-z0AyTbOEE60j/883X17mxgoaVlryNtn0dfEB0C18G2s="; }; - propagatedBuildInputs = [ pygtk numpy ]; + buildInputs = [ + gtk3 + pango + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ pygobject3 xcffib pycairo numpy ]; + + # Cannot find pango without strictDeps = false + strictDeps = false; outputs = [ "out" "man" ];