From ff8aa750ae88928917e9508176e3b98d4661b50e Mon Sep 17 00:00:00 2001 From: Bryton Hall Date: Sun, 4 Sep 2022 11:29:42 -0400 Subject: [PATCH] giara: 1.0 -> 1.0.1 --- pkgs/applications/networking/giara/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index b17430dc09b..60c2ad8262c 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -14,11 +14,11 @@ , glib-networking , libadwaita , appstream +, blueprint-compiler }: - python3.pkgs.buildPythonApplication rec { pname = "giara"; - version = "1.0"; + version = "1.0.1"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg="; + hash = "sha256-hKaniW+bbuKUrETMQGWwvC2kyudK9tCE/R69dOFzdQM="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { pkg-config ninja wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ @@ -58,16 +59,6 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 ]; - patches = [ - # Proper support for gtk4 and libadwaita - # @TODO: Remove when bumping the version. - (fetchpatch { - name = "giara-gtk4-libadwaita.patch"; - url = "https://gitlab.gnome.org/World/giara/-/commit/6204427f8b8e3d8c72b669717a3f129ffae401d9.patch"; - sha256 = "sha256-E8kbVsACPD2gkfNrzYUy0+1U7+/pIkUu4rCkX+xY0us="; - }) - ]; - postPatch = '' substituteInPlace meson_post_install.py \ --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"