diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-03-11 23:55:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-04-06 01:35:20 +0200 |
| commit | 8de8fc42230bae261992998edb9c75de53d455f8 (patch) | |
| tree | 9e0081c8fe5debe3ba9a7cd15234f3573d5030a1 /pkgs/applications/misc/girara | |
| parent | 0d8905a0562ac4c1053176b6983bd32935512eac (diff) | |
girara: 0.3.7 → 0.3.9
https://git.pwmt.org/pwmt/girara/-/compare/0.3.7...0.3.9 Also format the expression. Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/applications/misc/girara')
| -rw-r--r-- | pkgs/applications/misc/girara/default.nix | 57 |
1 files changed, 50 insertions, 7 deletions
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 841aeca58969a..a6736c7a2dd3a 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,21 +1,64 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib +, stdenv +, fetchurl +, fetchpatch2 +, meson +, ninja +, pkg-config +, check +, dbus +, xvfb-run +, glib +, gtk +, gettext +, libiconv +, json-glib +, libintl }: stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc="; + hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; - buildInputs = [ libintl libiconv json_c ]; - propagatedBuildInputs = [ glib gtk ]; - nativeCheckInputs = [ xvfb-run ]; + patches = [ + # Fix memory management bug revealed by GLib 2.76. + # https://git.pwmt.org/pwmt/girara/-/issues/17 + (fetchpatch2 { + url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch"; + hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + check + dbus + ]; + + buildInputs = [ + libintl + libiconv + json-glib + ]; + + propagatedBuildInputs = [ + glib + gtk + ]; + + nativeCheckInputs = [ + xvfb-run + ]; doCheck = !stdenv.isDarwin; |