From 7497b4721c776cc8b2c04a93eb255d750b07b0f7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 Jun 2021 09:29:58 +0200 Subject: [PATCH] doc: Fix make in nix-shell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running make manually, makeFlags will not be passed. Let’s just use an environment variable. --- doc/contributing/contributing-to-documentation.chapter.md | 2 +- 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 642beba74d6..7fd4b93f0d2 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 25389fa2da7..ac382ec8519 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"; }