gnu: gdk-pixbuf: Use search path instead of patching docbook schema location.

* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Remove phase patch-docbook.
[native-inputs]: Add LIBXML2.
This commit is contained in:
Marius Bakke 2022-07-25 03:13:55 +02:00
parent 8c698d7de6
commit e220ad684f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -644,20 +644,6 @@ (define-public gdk-pixbuf
#:configure-flags '("-Dinstalled_tests=false")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "docs"
(substitute* "meson.build"
(("http://docbook.sourceforge.net/release/xsl/current/")
(string-append (assoc-ref (or native-inputs inputs)
"docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/")))
(substitute* (find-files "." "\\.xml$")
(("http://www.oasis-open.org/docbook/xml/4\\.3/")
(string-append (assoc-ref ,(if (%current-target-system)
'(or native-inputs inputs)
'inputs) "docbook-xml")
"/xml/dtd/docbook/"))))))
(add-before 'configure 'disable-failing-tests
(lambda _
(substitute* "tests/meson.build"
@ -688,6 +674,7 @@ (define-public gdk-pixbuf
("gettext" ,gettext-minimal)
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc.
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("perl" ,perl)
("pkg-config" ,pkg-config)
("xsltproc" ,libxslt)))