diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/tools/graphics/escrotum | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/escrotum')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/escrotum/default.nix | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix index 6a0a2b2683d9..08136f57ef88 100644 --- a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix +++ b/nixpkgs/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" ]; |