From 9cb2338426461d890bd11679b09c8bf15b569939 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 11 Aug 2019 14:23:39 +0200 Subject: release.nix: Fix build of manual A recent change[1] that has been merged to nixpkgs master has factored out the generation of the options in (among others like JSON) DocBook format into pkgs.nixosOptionsDoc and subsequently also changed the path of the XSL files. Ideally, the generation of the manual on our side would also just use a single function that is provided via nixpkgs for generating the *full* manual. The nixosOptionsDoc function however provides *only* the option list in DocBook format, which is useful to *some* extent but doesn't deduplicate the extra params we give to DocBook (eg. style sheets for syntax highlighting). This and the fact that I only have limited time at the moment is why I left all the other crap we duplicate on our side as-is and only change the path to the XSL files. [1]: https://github.com/NixOS/nixpkgs/commit/5cfd034af0afe55e4d25748ec986c71b3bfbe3dd Signed-off-by: aszlig --- release.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 14179fc6..ac5eb687 100644 --- a/release.nix +++ b/release.nix @@ -194,6 +194,8 @@ in with pkgsUpstream.lib; with builtins; { admon.style = ""; }; + xsltPath = "${nixpkgs}/nixos/lib/make-options-doc"; + in pkgsUpstream.stdenv.mkDerivation { name = "vuizvui-options"; @@ -203,10 +205,10 @@ in with pkgsUpstream.lib; with builtins; { cp -r "${./doc}" doc chmod -R +w doc xsltproc -o intermediate.xml \ - "${nixpkgs}/nixos/doc/manual/options-to-docbook.xsl" \ + "${xsltPath}/options-to-docbook.xsl" \ ${optionsFile} xsltproc -o doc/options-db.xml \ - "${nixpkgs}/nixos/doc/manual/postprocess-option-descriptions.xsl" \ + "${xsltPath}/postprocess-option-descriptions.xsl" \ intermediate.xml dest="$out/share/doc/vuizvui" -- cgit 1.4.1