diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-07-04 08:30:13 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-07-04 09:10:13 -0400 |
| commit | e65c2c66726dfa77e3b9ab51ae85887884162c8f (patch) | |
| tree | f9671c1df09d37ad10f1653cdc21ca835c4806a6 | |
| parent | d11f5a9d15c2d1eb735750392d69d515ae51df6c (diff) | |
| download | nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar.gz nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar.bz2 nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar.lz nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar.xz nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.tar.zst nixpkgs-e65c2c66726dfa77e3b9ab51ae85887884162c8f.zip | |
docs: find docbook rng from doc-support
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/default.nix | 1 | ||||
| -rw-r--r-- | doc/doc-support/default.nix | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index 06a70519488..afd3c781ebf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -25,8 +25,8 @@ clean: rm -rf ./out/ ./highlightjs .PHONY: validate -validate: manual-full.xml - jing "$$RNG" manual-full.xml +validate: manual-full.xml doc-support/result + jing doc-support/result/docbook.rng manual-full.xml out/html/index.html: manual-full.xml style.css highlightjs mkdir -p out/html diff --git a/doc/default.nix b/doc/default.nix index 5cd91e0f112..5a606981d8c 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -15,7 +15,6 @@ in pkgs.stdenv.mkDerivation { # otherwise they won't reapply :) HIGHLIGHTJS = pkgs.documentation-highlighter; XSL = "${pkgs.docbook_xsl_ns}/xml/xsl"; - RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index 94b3ea464d9..6cf7666ccf8 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -10,6 +10,9 @@ in pkgs.runCommand "doc-support" {} cd result ln -s ${locationsXml} ./function-locations.xml ln -s ${functionDocs} ./function-docs + + ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng + echo -n "${version}" > ./version ) mv result $out |