about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-03-22 16:07:13 +0800
committerBobby Rong <rjl931189261@126.com>2023-03-22 16:15:31 +0800
commit35968448705a98631fe169b1b4aac0bb21a1c184 (patch)
treeaea9effad16dfef6df2fb5c733fb4146b1efa7a6
parent60c1d71f2ba4c80178ec84523c2ca0801522e0a6 (diff)
timezonemap: Fix crashes when running in GLib 2.76
ref: https://salsa.debian.org/cinnamon-team/libtimezonemap/-/merge_requests/3
-rw-r--r--pkgs/development/libraries/timezonemap/default.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix
index ae8c956d88cde..25efaa6518c61 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