diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-07-04 08:51:43 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-07-04 09:10:14 -0400 |
| commit | 5a0696f6d0bf3344437eb1c83f1108e46664e24a (patch) | |
| tree | d6e3adab9507b38291c55ec1afd1c9aa5a95573b | |
| parent | de58e706f9965b90a8df98e3cc29ff4fcc22cb18 (diff) | |
| download | nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar.gz nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar.bz2 nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar.lz nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar.xz nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.tar.zst nixpkgs-5a0696f6d0bf3344437eb1c83f1108e46664e24a.zip | |
xmlformat.conf: move to doc-support build
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/default.nix | 1 | ||||
| -rw-r--r-- | doc/doc-support/default.nix | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index 24ad42185f9..4bf33f7dd43 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -8,10 +8,10 @@ debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" .PHONY: format -format: +format: doc-support/result find . -iname '*.xml' -type f | while read f; do \ echo $$f ;\ - xmlformat --config-file "$$XMLFORMAT_CONFIG" -i $$f ;\ + xmlformat --config-file "doc-support/result/xmlformat.conf" -i $$f ;\ done .PHONY: fix-misc-xml diff --git a/doc/default.nix b/doc/default.nix index 7fed48c45e6..971c60b35c2 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -13,7 +13,6 @@ in pkgs.stdenv.mkDerivation { # nix-shell between each test, maybe even: # $ nix-shell --run "make clean all" # otherwise they won't reapply :) - XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index ac9a6f52c83..c8be039fa7e 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -14,6 +14,7 @@ in pkgs.runCommand "doc-support" {} ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng ln -s ${pkgs.docbook_xsl_ns}/xml/xsl ./xsl + ln -s ${../../nixos/doc/xmlformat.conf} ./xmlformat.conf ln -s ${pkgs.documentation-highlighter} ./highlightjs echo -n "${version}" > ./version |