diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-07-04 08:46:59 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-07-04 09:10:14 -0400 |
| commit | de58e706f9965b90a8df98e3cc29ff4fcc22cb18 (patch) | |
| tree | daa3c947d30f222071f7d025eef768e70472d15e | |
| parent | 35262ba6a78125e6f76055dd99416a93d00288fb (diff) | |
| download | nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar.gz nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar.bz2 nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar.lz nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar.xz nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.tar.zst nixpkgs-de58e706f9965b90a8df98e3cc29ff4fcc22cb18.zip | |
docs: Get highlightjs from build symlink
| -rw-r--r-- | doc/Makefile | 10 | ||||
| -rw-r--r-- | doc/default.nix | 1 | ||||
| -rw-r--r-- | doc/doc-support/default.nix | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile index c127bea13c1..24ad42185f9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -63,12 +63,12 @@ out/epub/manual.epub: manual-full.xml cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" * rm -rf "out/epub/scratch/" -highlightjs: +highlightjs: doc-support/result mkdir -p highlightjs - cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/ - cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/ - cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/ - cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/ + cp -r doc-support/result/highlightjs/highlight.pack.js highlightjs/ + cp -r doc-support/result/highlightjs/LICENSE highlightjs/ + cp -r doc-support/result/highlightjs/mono-blue.css highlightjs/ + cp -r doc-support/result/highlightjs/loader.js highlightjs/ manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml functions/library/generated *.xml **/*.xml **/**/*.xml diff --git a/doc/default.nix b/doc/default.nix index 718767f53b6..7fed48c45e6 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 :) - HIGHLIGHTJS = pkgs.documentation-highlighter; 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 9e733524459..ac9a6f52c83 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -14,6 +14,8 @@ 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 ${pkgs.documentation-highlighter} ./highlightjs + echo -n "${version}" > ./version ) mv result $out |