puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4177 from knedlsepp/fix-NIX_CONFIG-doc

Browse source 
Fix the docs about the new NIX_CONFIG env var
This commit is contained in:
Eelco Dolstra 2020-10-21 18:05:28 +02:00 committed by GitHub
parent e556a1beb7 7f60f48e1a
commit 21830cb044
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/src/command-ref/conf-file-prefix.md
View file

@ -19,7 +19,7 @@ By default Nix reads settings from the following places:
and `XDG_CONFIG_HOME`. If these are unset, it will look in and `XDG_CONFIG_HOME`. If these are unset, it will look in
`$HOME/.config/nix.conf`. `$HOME/.config/nix.conf`.
- If `NIX_OPTIONS` is set, its contents is treated as the contents of - If `NIX_CONFIG` is set, its contents is treated as the contents of
a configuration file. a configuration file.
The configuration files consist of `name = The configuration files consist of `name =

2
doc/manual/src/command-ref/env-common.md
View file

@ -81,7 +81,7 @@ Most Nix commands interpret the following environment variables:
Overrides the location of the system Nix configuration directory Overrides the location of the system Nix configuration directory
(default `prefix/etc/nix`). (default `prefix/etc/nix`).
- `NIX_OPTIONS` - `NIX_CONFIG`
Applies settings from Nix configuration from the environment. Applies settings from Nix configuration from the environment.
The content is treated as if it was read from a Nix configuration file. The content is treated as if it was read from a Nix configuration file.
Settings are separated by the newline character. Settings are separated by the newline character.