diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-04 09:29:58 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-05 11:29:01 +0000 |
| commit | f0dfe62190d936767844195a48f585e26c7e4ed4 (patch) | |
| tree | 5778185c82d35dd1a133d8ae2a614311a282391e | |
| parent | Merge pull request #125773 from NixOS/backport-125724-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-125625-to-release-21.05.tar.gz | |
doc: Fix make in nix-shellorigin/backport-125625-to-release-21.05
When running make manually, makeFlags will not be passed. Let’s just use an environment variable.
(cherry picked from commit 034a9c0e16aab12978bb4a1c1f0e86c64778b388)
| -rw-r--r-- | doc/contributing/contributing-to-documentation.chapter.md | 2 | ||||
| -rw-r--r-- | doc/default.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 642beba74d61..7fd4b93f0d2b 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -7,7 +7,7 @@ You can quickly check your edits with `make`: ```ShellSession $ cd /path/to/nixpkgs/doc $ nix-shell -[nix-shell]$ make $makeFlags +[nix-shell]$ make ``` If you experience problems, run `make debug` to help understand the docbook errors. diff --git a/doc/default.nix b/doc/default.nix index 25389fa2da7e..ac382ec8519c 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -17,10 +17,6 @@ in pkgs.stdenv.mkDerivation { src = lib.cleanSource ./.; - makeFlags = [ - "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters" - ]; - postPatch = '' ln -s ${doc-support} ./doc-support/result ''; @@ -37,4 +33,7 @@ in pkgs.stdenv.mkDerivation { echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; + + # Environment variables + PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters"; } |