ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xdg-utils: Drop docbook workarounds.

Browse source 
* 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
This commit is contained in:
Bruno Victal 2023-10-09 21:06:15 +01:00 committed by Ludovic Courtès
parent 8ca7d9eef7
commit 78bd62abaa
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/freedesktop.scm
View file

@ -627,7 +627,8 @@ (define-public xdg-utils
"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 @@ (define-public xdg-utils
(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 @@ (define-public xdg-utils
(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"