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

nix-profile.sh: Revert to single-user version

Browse source 
Commit 6a214f3e06 copied most of the Nix
shell initialisation code from NixOS to nix-profile.sh; however, that
code assumes a multi-user install and is Linux-specific (e.g. it calls
the "stat" command).  So go back to the simple single-user version.

Fixes #49.
This commit is contained in:
Eelco Dolstra 2012-09-13 17:48:19 -04:00
parent 54fe8e0773
commit aac14222f5
1 changed files with 11 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
scripts/nix-profile.sh.in
View file

@ -1,50 +1,17 @@
export NIX_USER_PROFILE_DIR=@localstatedir@/nix/profiles/per-user/$USER if test -n "$HOME"; then
export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile" NIX_LINK="$HOME/.nix-profile"
# Set up the per-user profile. # Set the default profile.
mkdir -m 0755 -p $NIX_USER_PROFILE_DIR if ! [ -L "$NIX_LINK" ]; then
if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then echo "creating $NIX_LINK" >&2
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
fi @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
if ! test -L $HOME/.nix-profile; then
echo "creating $HOME/.nix-profile" >&2
if test "$USER" != root; then
@coreutils@/ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
else
# Root installs in the system-wide profile by default.
@coreutils@/ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
fi fi
fi
export PATH="$HOME/.nix-profile/bin:$PATH" # Subscribe the root user to the Nixpkgs channel by default.
if [ ! -e $HOME/.nix-channels ]; then
# Subscribe the root user to the Nixpkgs channel by default.
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
echo "http://nixos.org/releases/nixos/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels echo "http://nixos.org/releases/nixos/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
fi
# Create the per-user garbage collector roots directory.
NIX_USER_GCROOTS_DIR=@localstatedir@/nix/gcroots/per-user/$USER
mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
fi
# Set up a default Nix expression from which to install stuff.
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
echo "creating $HOME/.nix-defexpr" >&2
rm -f $HOME/.nix-defexpr
mkdir $HOME/.nix-defexpr
if [ "$USER" != root ]; then
@coreutils@/ln -s @localstatedir@/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
fi fi
fi
# Set up secure multi-user builds: non-root users build through the export PATH=$NIX_LINK/bin:$PATH
# Nix daemon.
if [ "$USER" != root -a -e @localstatedir@/nix/daemon-socket/socket ]; then
export NIX_REMOTE=daemon
else
unset NIX_REMOTE
fi fi