Rely on XML_CATALOG_FILES variable for DocBook #30189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jtojnar
force-pushed
the
docbook-xml-catalogs-hook
branch
from
a41ae1f
to
cddf9bf
Compare
|
The packages changed here, seems to build all fine. So only resolving merge conflicts is left. |
In the previous commit, we added a setup hook to docbook dtd and xsl packages, that adds derivation’s catalog file to an environment variable. That should, in theory, remove the need for declaring their catalogs manually. Unfortunately, xmlcatalog utility expects exactly one catalog file, completely disregarding the environment variable in non-interactive context. In the same spirit, the design of gtk-doc m4 files only admits a single catalog file, resulting in another ugly hack.
jtojnar
force-pushed
the
docbook-xml-catalogs-hook
branch
from
cddf9bf
to
2cc8173
Compare
|
@Mic92 rebased. |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Previously DocBook DTD and XSL files were not added to XML_CATALOG_FILES variable, so the path had to be adjusted manually in the configuration script for each derivation if we did not want
xmllintandxsltprocto download them from network.I cherry picked this from GNOME 3.26 PR since it overloaded the hydra jobset there.
Things done
I successfully compiled flatpak and gnome-dictionary with the patched gtk-doc, the documentation was built without any attempts to access network. The other modified packages also built without any problem.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)cc @pSub (
gtk_doc), @edolstra (docbook_xsl)