From ab159e07f3d47a9ae662fee94792ccb898f56db0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Jan 2026 22:57:45 +0800 Subject: [PATCH] libgda5: Fix build with gettext 0.25 https://hydra.nixos.org/build/318044074/nixlog/1 --- pkgs/development/libraries/libgda/5.x.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix index ff40c3ccf86e..ea59cdbeb500 100644 --- a/pkgs/development/libraries/libgda/5.x.nix +++ b/pkgs/development/libraries/libgda/5.x.nix @@ -8,6 +8,7 @@ libxml2, gtk3, openssl, + gettext, gnome, gobject-introspection, vala, @@ -46,12 +47,24 @@ stdenv.mkDerivation rec { # Fix configure detection of features with c99. ./0001-gcc14-fix.patch + + # Fix build with gettext 0.25 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/libgda5/raw/945495e5c6cdd98a5360eff77245421876a97a57/f/gettext.patch"; + hash = "sha256-DOCsCbx+HLZvlpMgSQrW5YoWl/EhDuQEln18YDqgCVk="; + }) + # Fix conflicting types + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/libgda5/raw/76be2c07cb747ce30cc63da21662abb589814404/f/types.patch"; + hash = "sha256-LdvDQm7p0uWznBCD8qhJ5h44zNWLmI0BoqYPCeTBN9M="; + }) ]; nativeBuildInputs = [ pkg-config intltool itstool + gettext gobject-introspection vala autoreconfHook