cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #189743 from hall/giara

Browse source 
giara: 1.0 -> 1.0.1
This commit is contained in:
Christian Kögler 2022-09-13 07:25:53 +02:00 committed by GitHub
commit fb85f0c136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/networking/giara/default.nix
View file

@ -14,11 +14,11 @@
, glib-networking , glib-networking
, libadwaita , libadwaita
, appstream , appstream
, blueprint-compiler
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "giara"; pname = "giara";
version = "1.0"; version = "1.0.1";
format = "other"; format = "other";
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "World"; owner = "World";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg="; hash = "sha256-hKaniW+bbuKUrETMQGWwvC2kyudK9tCE/R69dOFzdQM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
pkg-config pkg-config
ninja ninja
wrapGAppsHook4 wrapGAppsHook4
blueprint-compiler
]; ];
buildInputs = [ buildInputs = [
@ -58,16 +59,6 @@ python3.pkgs.buildPythonApplication rec {
beautifulsoup4 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 = '' postPatch = ''
substituteInPlace meson_post_install.py \ substituteInPlace meson_post_install.py \
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache" --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"