From 35968448705a98631fe169b1b4aac0bb21a1c184 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 22 Mar 2023 16:07:13 +0800 Subject: [PATCH] timezonemap: Fix crashes when running in GLib 2.76 ref: https://salsa.debian.org/cinnamon-team/libtimezonemap/-/merge_requests/3 --- pkgs/development/libraries/timezonemap/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index ae8c956d88c..25efaa6518c 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ stdenv +, lib , autoreconfHook , fetchbzr +, fetchpatch , pkg-config , gtk3 , glib @@ -20,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-wCJXwgnN+aZVerjQCm8oT3xIcwmc4ArcEoCh9pMrt+E="; }; + patches = [ + # Fix crashes when running in GLib 2.76 + # https://bugs.launchpad.net/ubuntu/+source/libtimezonemap/+bug/2012116 + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/libtimezonemap/plain/debian/patches/timezone-map-Never-try-to-access-to-free-d-or-null-values.patch?id=88f72f724e63df061204f6818c9a1e7d8c003e29"; + sha256 = "sha256-M5eR0uaqpJOeW2Ya1Al+3ZciXukzHpnjJTMVvdO0dPE="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook