diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 841aeca58969..a6736c7a2dd3 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;