From 66430ab09ec0375d535812a0e29decc84b076f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Apr 2022 03:07:23 +0000 Subject: [PATCH] banking: 0.3.0 -> 0.4.0 --- pkgs/applications/office/banking/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 8f2636395292..c46fba171495 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -5,27 +5,26 @@ , appstream-glib , desktop-file-utils , glib -, gtk3 , libxml2 , meson , ninja , pkg-config , wrapGAppsHook , gobject-introspection -, libhandy +, libadwaita , librsvg }: python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.3.0"; + version = "0.4.0"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d"; + sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI="; }; patches = [ @@ -35,17 +34,21 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch"; sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc="; }) + # fix build with libadwaita 1.0.0 + (fetchpatch { + url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch"; + hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0="; + }) ]; postPatch = '' - patchShebangs meson_post_install.py + patchShebangs meson_post_conf.py meson_post_install.py ''; nativeBuildInputs = [ appstream-glib # for appstream-util desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources - gtk3 # for gtk-update-icon-cache libxml2 # for xmllint meson ninja @@ -55,8 +58,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gobject-introspection - gtk3 - libhandy + libadwaita librsvg ];