diff mbox series

[bug#65479,44/61] gnu: iputils: Drop docbook workarounds.

Message ID 855eb2fb2b07cbca8ac7936147fff681004b2fc4.1692828533.git.mirai@makinata.eu
State New
Headers show
Series The Draining of the XML & DocBook Swamp. | expand

Commit Message

Bruno Victal Aug. 24, 2023, 4:15 a.m. UTC 
* gnu/packages/networking.scm (iputils)[arguments]<#:phases>: Drop
'fix-docbook-url phase.
[native-inputs]: Use docbook-xml-5.0.1 over docbook-xml.
---
 gnu/packages/networking.scm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 488d015107..f0ba9925c9 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1590,27 +1590,12 @@  (define-public iputils
                 "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-DBUILD_RARPD=true")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-docbook-url
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl"))
-                    (uri (string-append docbook-xsl "/xml/xsl/docbook-xsl-"
-                                        ,(package-version docbook-xsl))))
-               (for-each
-                (lambda (file)
-                  (substitute* file
-                    (("http://docbook\\.sourceforge\\.net/release/xsl-ns/current")
-                     uri)))
-                (cons "doc/meson.build"
-                      (find-files "doc" "\\.xsl$")))
-               #t))))))
+     `(#:configure-flags '("-DBUILD_RARPD=true")))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)
        ("docbook-xsl" ,docbook-xsl)
-       ("docbook-xml" ,docbook-xml)
+       ("docbook-xml" ,docbook-xml-5.0.1)
        ("libxml2" ,libxml2)          ;for XML_CATALOG_FILES
        ("xsltproc" ,libxslt)))
     (inputs