diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-06 10:42:29 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 10:42:29 -0300 |
| commit | 33e333e2a6828c4d7a344fef0c92844bca865deb (patch) | |
| tree | e3e112a4ae6f7149d76422f3c871c7c6c084f461 | |
| parent | 122413f680a24bbec575398119390e9a69e68164 (diff) | |
| parent | 9e8df69a9f0ab8c4b97d7e0132e45cd650cd8993 (diff) | |
| download | nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar.gz nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar.bz2 nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar.lz nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar.xz nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.tar.zst nixpkgs-33e333e2a6828c4d7a344fef0c92844bca865deb.zip | |
Merge pull request #148910 from rasendubi/escrotum-2020-12-07
escrotum: 2019-06-10 -> 2020-12-07
| -rw-r--r-- | pkgs/tools/graphics/escrotum/default.nix | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 6a0a2b2683d..08136f57ef8 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" ]; |