diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-25T10·25+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-25T10·25+0100 |
| commit | f1bdeac9864de8cd9994bb41da79f3a4d812dadc (patch) | |
| tree | 9ea00480f826dc8d8d8248e11323266a42f9d4ae /doc/manual/command-ref | |
| parent | 9b05d5848c2fce73b75b3411e362c2bd48d53dcb (diff) | |
| parent | 152b1d6bf9c89b4db9848475e3000821e159d479 (diff) | |
Merge branch 'master' into new-cli
Diffstat (limited to 'doc/manual/command-ref')
| -rw-r--r-- | doc/manual/command-ref/env-common.xml | 6 | ||||
| -rw-r--r-- | doc/manual/command-ref/nix-shell.xml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/manual/command-ref/env-common.xml b/doc/manual/command-ref/env-common.xml index cb1ecfee123e..27efef945f15 100644 --- a/doc/manual/command-ref/env-common.xml +++ b/doc/manual/command-ref/env-common.xml @@ -11,6 +11,12 @@ <variablelist xml:id="env-common"> +<varlistentry><term><envar>IN_NIX_SHELL</envar></term> + + <listitem><para>Indicator that tells if the current environment was set up by + <command>nix-shell</command>.</para></listitem> + +</varlistentry> <varlistentry xml:id="env-NIX_PATH"><term><envar>NIX_PATH</envar></term> diff --git a/doc/manual/command-ref/nix-shell.xml b/doc/manual/command-ref/nix-shell.xml index 6f00e28cacaa..c64c93ec3ac2 100644 --- a/doc/manual/command-ref/nix-shell.xml +++ b/doc/manual/command-ref/nix-shell.xml @@ -267,7 +267,7 @@ dependencies in Nixpkgs.</para> <para>The lines starting with <literal>#! nix-shell</literal> specify <command>nix-shell</command> options (see above). Note that you cannot -write <literal>#1 /usr/bin/env nix-shell -i ...</literal> because +write <literal>#! /usr/bin/env nix-shell -i ...</literal> because many operating systems only allow one argument in <literal>#!</literal> lines.</para> |