diff options
| author | Bruno Victal <mirai@makinata.eu> | 2023-10-09 21:06:15 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:10 +0200 |
| commit | 78bd62abaac7d8eb2dce6d8e50b60544843602b1 (patch) | |
| tree | 9a759cba75e64ec1d98215d3c8d4c77d98df2aa6 | |
| parent | 8ca7d9eef713e0d6b19aa1d429ba125f2a592cb8 (diff) | |
| download | guix-78bd62abaac7d8eb2dce6d8e50b60544843602b1.tar.gz guix-78bd62abaac7d8eb2dce6d8e50b60544843602b1.zip | |
gnu: xdg-utils: Drop docbook workarounds.
* gnu/packages/freedesktop.scm (xdg-utils)[arguments]<#:phases>: Drop
locate-catalog-files.
[modules]: Properly import gnu-build-system modules.
[native-inputs]: Reorder.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I47f00f5901649b6e530a544fee97f41fa66c6572
| -rw-r--r-- | gnu/packages/freedesktop.scm | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 636d63e877..36a925c951 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -627,7 +627,8 @@ database is translated at Transifex.") "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) + (list docbook-xsl docbook-xml-4.1.2 + libxslt xmlto w3m-for-tests)) (inputs (list bash-minimal ;for 'wrap-program' coreutils @@ -643,7 +644,8 @@ database is translated at Transifex.") (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + (guix build gnu-build-system) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths @@ -654,32 +656,6 @@ database is translated at Transifex.") (substitute* "scripts/xdg-open.in" (("/usr/bin/printf") (search-input-file inputs "bin/printf"))))) - (add-before 'build 'locate-catalog-files - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let* ((native (or native-inputs inputs)) - (xmldoc (search-input-directory native - "xml/dtd/docbook")) - (xsldoc (search-input-directory - native - (string-append "xml/xsl/docbook-xsl-" - #$(package-version - (this-package-native-input - "docbook-xsl")))))) - (for-each (lambda (file) - (substitute* file - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd")))) - (find-files "scripts/desc" "\\.xml$")) - (substitute* "scripts/Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitition. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) man") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl man"))) - (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl"))))) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" |