diff options
| author | Daniel Șerbănescu <daniel@serbanescu.dk> | 2022-01-23 08:19:08 +0100 |
|---|---|---|
| committer | Daniel Șerbănescu <daniel@serbanescu.dk> | 2022-01-23 08:19:08 +0100 |
| commit | a59d23e2b2ec592382653bcbb11ae0ac98c25cc8 (patch) | |
| tree | 8285678e3dbc2db3ba84d2cc196eeaf03abfe6c5 /pkgs/applications/networking/giara | |
| parent | 632ca37b278832e605a7b4721d84a2ad63749f82 (diff) | |
giara: 0.3 -> 1.0
Diffstat (limited to 'pkgs/applications/networking/giara')
| -rw-r--r-- | pkgs/applications/networking/giara/default.nix | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 1f4d2e0a2d90c..b17430dc09bda 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -1,22 +1,24 @@ { lib , fetchFromGitLab +, fetchpatch , meson , gobject-introspection , pkg-config , ninja , python3 -, wrapGAppsHook -, gtk3 +, wrapGAppsHook4 +, gtk4 , gdk-pixbuf , webkitgtk -, gtksourceview4 -, libhandy +, gtksourceview5 , glib-networking +, libadwaita +, appstream }: python3.pkgs.buildPythonApplication rec { pname = "giara"; - version = "0.3"; + version = "1.0"; format = "other"; @@ -25,24 +27,25 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9"; + hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg="; }; nativeBuildInputs = [ + appstream meson gobject-introspection pkg-config ninja - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 gdk-pixbuf webkitgtk - gtksourceview4 - libhandy + gtksourceview5 glib-networking + libadwaita ]; pythonPath = with python3.pkgs; [ @@ -55,6 +58,21 @@ 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" + ''; + # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; |