From 35262ba6a78125e6f76055dd99416a93d00288fb Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 4 Jul 2019 08:46:47 -0400
Subject: [PATCH] docs: get XSL from build / symlink

---
 doc/Makefile                | 10 +++++-----
 doc/default.nix             |  1 -
 doc/doc-support/default.nix |  1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index afd3c781ebf9..c127bea13c1e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -28,12 +28,12 @@ clean:
 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
+out/html/index.html: doc-support/result manual-full.xml style.css highlightjs
 	mkdir -p out/html
 	xsltproc ${xsltFlags} \
 		--nonet --xinclude \
 		--output $@ \
-		"$$XSL/docbook/xhtml/docbook.xsl" \
+		doc-support/result/xsl/docbook/xhtml/docbook.xsl \
 		./manual-full.xml
 
 	mkdir -p out/html/highlightjs/
@@ -43,20 +43,20 @@ out/html/index.html: manual-full.xml style.css highlightjs
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
-	cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
+	cp doc-support/result/xsl/docbook/images/callouts/*.svg out/html/images/callouts/
 	chmod u+w -R out/html/
 
 out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
 	xsltproc ${xsltFlags} --nonet \
 		--output out/epub/scratch/ \
-		"$$XSL/docbook/epub/docbook.xsl" \
+		doc-support/result/xsl/docbook/epub/docbook.xsl \
 		./manual-full.xml
 
 	cp ./overrides.css out/epub/scratch/OEBPS
 	cp ./style.css out/epub/scratch/OEBPS
 	mkdir -p out/epub/scratch/OEBPS/images/callouts/
-	cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
+	cp doc-support/result/xsl/docbook/images/callouts/*.svg out/epub/scratch/OEBPS/images/callouts/
 	echo "application/epub+zip" > mimetype
 	zip -0Xq "out/epub/manual.epub" mimetype
 	rm mimetype
diff --git a/doc/default.nix b/doc/default.nix
index 5a606981d8c2..718767f53b62 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -14,7 +14,6 @@ in pkgs.stdenv.mkDerivation {
   # $ nix-shell --run "make clean all"
   # otherwise they won't reapply :)
   HIGHLIGHTJS = pkgs.documentation-highlighter;
-  XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
   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 6cf7666ccf8d..9e7335244595 100644
--- a/doc/doc-support/default.nix
+++ b/doc/doc-support/default.nix
@@ -12,6 +12,7 @@ in pkgs.runCommand "doc-support" {}
     ln -s ${functionDocs} ./function-docs
 
     ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng
+    ln -s ${pkgs.docbook_xsl_ns}/xml/xsl ./xsl
 
     echo -n "${version}" > ./version
   )