From 655c524d910f1b7dabaeeecbec70b2466bdf8589 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jul 2024 22:45:13 +0200 Subject: [PATCH] libxml2: Fix XInclude failure handling This fixes colord api docs build with libxml2 2.13. --- pkgs/development/libraries/libxml2/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 92f45907397b..1d57ce51b7fb 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , autoreconfHook , libintl @@ -35,6 +36,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM="; }; + patches = [ + # Fix XInclude failing too aggresively. + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/772 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch"; + hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU="; + }) + # Fix error handling + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch"; + hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [