|
1 | 1 | diff --git a/doc/manual/local.mk b/doc/manual/local.mk
|
2 |
| -index abdfd6a..dea46f3 100644 |
| 2 | +index abdfd6a..f1cec77 100644 |
3 | 3 | --- a/doc/manual/local.mk
|
4 | 4 | +++ b/doc/manual/local.mk
|
5 |
| -@@ -32,7 +32,7 @@ dummy-env = env -i \ |
6 |
| - NIX_STATE_DIR=/dummy \ |
| 5 | +@@ -25,14 +25,16 @@ clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8 |
| 6 | + |
| 7 | + # Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox. |
| 8 | + # Set cores to 0 because otherwise nix show-config resolves the cores based on the current machine |
| 9 | ++dum_DIR := $(realpath $(nix_DIR)) |
| 10 | ++ |
| 11 | + dummy-env = env -i \ |
| 12 | +- HOME=/dummy \ |
| 13 | +- NIX_CONF_DIR=/dummy \ |
| 14 | +- NIX_SSL_CERT_FILE=/dummy/no-ca-bundle.crt \ |
| 15 | +- NIX_STATE_DIR=/dummy \ |
| 16 | ++ HOME=$(dum_DIR)/dummy \ |
| 17 | ++ NIX_CONF_DIR=$(dum_DIR)/dummy \ |
| 18 | ++ NIX_SSL_CERT_FILE=$(dum_DIR)/dummy/no-ca-bundle.crt \ |
| 19 | ++ NIX_STATE_DIR=$(dum_DIR)/dummy \ |
7 | 20 | NIX_CONFIG='cores = 0'
|
8 | 21 |
|
9 | 22 | -nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
10 | 23 | +nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
11 | 24 |
|
12 | 25 | # re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
|
13 | 26 | define process-includes
|
14 |
| -@@ -96,52 +96,52 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli $(d)/sr |
| 27 | +@@ -96,52 +98,52 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli $(d)/sr |
15 | 28 | @cp $< $@
|
16 | 29 | @$(call process-includes,$@,$@)
|
17 | 30 |
|
@@ -79,10 +92,10 @@ index abdfd6a..dea46f3 100644
|
79 | 92 |
|
80 | 93 | # Generate the HTML manual.
|
81 | 94 | diff --git a/doc/manual/local.mk b/doc/manual/local.mk
|
82 |
| -index dea46f3..422d531 100644 |
| 95 | +index b4aba08..daed407 100644 |
83 | 96 | --- a/doc/manual/local.mk
|
84 | 97 | +++ b/doc/manual/local.mk
|
85 |
| -@@ -174,22 +174,22 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli |
| 98 | +@@ -176,22 +176,22 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli |
86 | 99 | @touch $@
|
87 | 100 |
|
88 | 101 | $(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md
|
|
0 commit comments