summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributing/contributing-to-documentation.chapter.md2
-rw-r--r--doc/default.nix7
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";
}