diff options
| author | Fabian Schmitthenner <development@schmitthenner.eu> | 2015-12-07 15:47:31 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-05 14:11:20 +0100 |
| commit | 0eb200e569affe89c8850ea993ae0f603f40f742 (patch) | |
| tree | e7337cd37f1fbfe81043d0aada63cf9825e33423 | |
| parent | 80ebd60e7ca3c48a19b94ddaeebb23182b703178 (diff) | |
propagate NIX_BUILD_SHELL also in pure builds document NIX_BUILD_SHELL in the nix-shell command documentation
| -rw-r--r-- | doc/manual/command-ref/nix-shell.xml | 16 | ||||
| -rwxr-xr-x | scripts/nix-build.in | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/manual/command-ref/nix-shell.xml b/doc/manual/command-ref/nix-shell.xml index a13d9d7c1..6f00e28ca 100644 --- a/doc/manual/command-ref/nix-shell.xml +++ b/doc/manual/command-ref/nix-shell.xml @@ -176,6 +176,22 @@ also <xref linkend="sec-common-options" />.</phrase></para> </refsection> +<refsection><title>Environment variables</title> + +<variablelist> + + <varlistentry><term><envar>NIX_BUILD_SHELL</envar></term> + + <listitem><para>Shell used to start the interactive environment. + Defaults to the <command>bash</command> found in <envar>PATH</envar>.</para></listitem> + + </varlistentry> + +</variablelist> + +</refsection> + + <refsection><title>Examples</title> <para>To build the dependencies of the package Pan, and start an diff --git a/scripts/nix-build.in b/scripts/nix-build.in index ea099532b..b4bb2fc3f 100755 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -270,7 +270,7 @@ foreach my $expr (@exprs) { my $tmp = $ENV{"TMPDIR"} // $ENV{"XDG_RUNTIME_DIR"} // "/tmp"; if ($pure) { foreach my $name (keys %ENV) { - next if grep { $_ eq $name } ("HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER"); + next if grep { $_ eq $name } ("HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL"); delete $ENV{$name}; } # NixOS hack: prevent /etc/bashrc from sourcing /etc/profile. |