diff mbox series

[bug#65479,core-updates,v2,27/62] gnu: xdg-user-dirs: Drop docbook workaround.

Message ID cdb76f99e354839d87d5c55116a6a55b29a4cc49.1695478390.git.mirai@makinata.eu
State New
Headers show
Series Docbook & XML/SGML improvements. | expand

Commit Message

Bruno Victal Sept. 23, 2023, 2:20 p.m. UTC 
* gnu/packages/freedesktop.scm (xdg-user-dirs)[arguments]: Remove.
[native-inputs]: Remove labels.
---
 gnu/packages/freedesktop.scm | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 250f742f6c..d1f767acd6 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2232,29 +2232,10 @@  (define-public xdg-user-dirs
                (base32 "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("docbook-xsl" ,docbook-xsl)
-       ("docbook-xml" ,docbook-xml-4.3)
-       ("xsltproc" ,libxslt)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'locate-catalog-files
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
-                                          "/xml/dtd/docbook"))
-                   (xsldoc (string-append (assoc-ref inputs "docbook-xsl")
-                                          "/xml/xsl/docbook-xsl-"
-                                          ,(package-version docbook-xsl))))
-               (for-each (lambda (file)
-                           (substitute* file
-                             (("http://.*/docbookx\\.dtd")
-                              (string-append xmldoc "/docbookx.dtd"))))
-                         (find-files "man" "\\.xml$"))
-               (substitute* "man/Makefile"
-                 (("http://.*/docbook\\.xsl")
-                  (string-append xsldoc "/manpages/docbook.xsl")))
-               #t))))))
+     (list gettext-minimal
+           docbook-xsl
+           docbook-xml-4.3
+           libxslt))
     (home-page "https://www.freedesktop.org/wiki/Software/xdg-user-dirs/")
     (synopsis "Tool to help manage \"well known\" user directories")
     (description "xdg-user-dirs is a tool to help manage \"well known\" user