From 5053a59a0b6284ef8269f90457c560ee294ae9ad Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Wed, 10 Sep 2025 09:55:21 +0200 Subject: [PATCH] gnu: Add and use libxml2-next/fixed. Fixes guix/guix#2599. * gnu/packages/xml.scm (libxml2-next/fixed): New variable. (libxml2-next-from-grafting): Change replacement to libxml2-next/fixed. Signed-off-by: Maxim Cournoyer --- gnu/packages/xml.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index dbb2f00fde3cd4df9ef9ec3a6b82467c212d0981..0d2be62d0c5c5b0bd4f65d5ed3155984d9337f10 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -271,10 +271,39 @@ project (but it is usable outside of the Gnome platform).") (append pkg-config python-minimal))))) +(define-public libxml2-next/fixed + (package + (inherit libxml2) + (properties '((hidden? . #t))) + (name "libxml2") + (version "2.14.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libxml2/" + (version-major+minor version)"/libxml2-" + version ".tar.xz")) + (sha256 + (base32 + "0jylv2kkyzih710blg24al7b43iaqg6xsfn52qy865knagrhdl03")))) + (arguments + (substitute-keyword-arguments (package-arguments libxml2-next) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'symlink-hardcoded-lib-for-grafts + (lambda _ + (let ((lib (string-append #$output "/lib/libxml2.so"))) + ;; XXX: When grafting, we need to reproduce the file paths to + ;; the libraries too. + (symlink (string-append lib ".16") + (string-append lib ".2"))))))))) + (native-inputs (modify-inputs (package-native-inputs libxml2) + (append pkg-config + python-minimal))))) + (define-public libxml2-next-for-grafting (package (inherit libxml2) - (replacement libxml2-next) + (replacement libxml2-next/fixed) (properties '((hidden? . #t))))) (define-public libxml2-xpath0