mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:NixOS/nix

Browse source
This commit is contained in:
Eelco Dolstra 2016-11-09 19:09:44 +01:00
commit 2af5d35fdc
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/installation/installing-binary.xml
View file

@ -26,6 +26,14 @@ $ mkdir /nix
$ chown alice /nix $ chown alice /nix
</screen> </screen>
The install script will modify the first writable file from amongst
<filename>.bash_profile</filename>, <filename>.bash_login</filename>
and <filename>.profile</filename> to source
<filename>~/.nix-profile/etc/profile.d/nix.sh</filename>. You can set
the <command>NIX_INSTALLER_NO_MODIFY_PROFILE</command> environment
variable before executing the install script to disable this
behaviour.
</para> </para>
<!-- <!--

6
scripts/install-nix-from-closure.sh
View file

@ -89,10 +89,12 @@ if [ -z "$_NIX_INSTALLER_TEST" ]; then
$nix/bin/nix-channel --update nixpkgs $nix/bin/nix-channel --update nixpkgs
fi fi
added=
if [ -z "$NIX_INSTALLER_NO_MODIFY_PROFILE" ]; then
# Make the shell source nix.sh during login. # Make the shell source nix.sh during login.
p=$HOME/.nix-profile/etc/profile.d/nix.sh p=$HOME/.nix-profile/etc/profile.d/nix.sh
added=
for i in .bash_profile .bash_login .profile; do for i in .bash_profile .bash_login .profile; do
fn="$HOME/$i" fn="$HOME/$i"
if [ -w "$fn" ]; then if [ -w "$fn" ]; then
@ -105,6 +107,8 @@ for i in .bash_profile .bash_login .profile; do
fi fi
done done
fi
if [ -z "$added" ]; then if [ -z "$added" ]; then
cat >&2 <<EOF cat >&2 <<EOF