doc/default.nix: make the manual build on more than one core#225921
doc/default.nix: make the manual build on more than one core#225921fricklerhandwerk merged 3 commits intomasterfrom unknown repository
Conversation
Let's build the manual with more than one core. Maybe people will take better care of it now that it is less painful to build.
|
Can't test (before and after this pr)
|
Try But yeah we should give the manual an entry in |
|
|
@pennae you're certainly more qualified than me to assess this. |
|
this looks like a good thing, but unfortunately it changes the output of the rendering process for some reason. the makefile must be missing some dependencies to make that happen, but for the md rendering part specifically we can do this. let's do this instead to get most of the benefits until the rendering infra can be migrated away from pandoc: diff --git a/doc/Makefile b/doc/Makefile
index ee98a3ee921..208f23f5023 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,6 +19,9 @@ pandoc_flags = --extract-media=$(pandoc_media_dir) \
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
+.PHONY: render-md
+render-md: ${MD_TARGETS}
+
.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
diff --git a/doc/default.nix b/doc/default.nix
index ac405c37903..4f55c95a04c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -20,6 +20,10 @@ in pkgs.stdenv.mkDerivation {
ln -s ${doc-support} ./doc-support/result
'';
+ preBuild = ''
+ make -j$NIX_BUILD_CORES render-md
+ '';
+
installPhase = ''
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")" |
|
Latest push implements @pennae's suggestion. |
|
Thanks a lot, everyone! |
Let's build the manual with more than one core. Maybe people will take better care of it now that it is less painful to build.