From 3f6141677dae2dc9b4c4c4390f60d58a50365a69 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Jan 2024 09:59:59 +0000 Subject: [PATCH] liblangtag: pull upstream fixes for gcc-13 Without the change build fails on `staging-next` against `gcc-13` as: lt-tag.c:36:1: note: include '' or provide a declaration of 'free' 35 | #include "lt-tag-private.h" +++ |+#include --- .../development/libraries/liblangtag/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index efd914ca7b10..0988bb9259d7 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -23,6 +23,20 @@ stdenv.mkDerivation rec { sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; }; + patches = [ + # Pull upstream fix for gcc-13 build compatibility + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://bitbucket.org/tagoh/liblangtag/commits/0b6e9f4616a34146e7443c4e9a7197153645e40b/raw"; + hash = "sha256-69wJDVwDCP5OPHKoRn9WZNrvfCvmlX3SwtRmcpJHn2o="; + }) + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://bitbucket.org/tagoh/liblangtag/commits/1497c4477d0fa0b7df1886951b953dd3cea54427/raw"; + hash = "sha256-k0Uaeg6YLxVze4fgf0kiyuiZJ5wh2Jq3h7cFPQPtwyo="; + }) + ]; + postPatch = '' gtkdocize cp "${core_zip}" data/core.zip