Pull nix-profile-daemon from 1.11
This commit is contained in:
parent
1dd29d7aeb
commit
6a037a738a
2 changed files with 55 additions and 0 deletions
|
@ -8,5 +8,6 @@ noinst-scripts += $(nix_noinst_scripts)
|
||||||
profiledir = $(sysconfdir)/profile.d
|
profiledir = $(sysconfdir)/profile.d
|
||||||
|
|
||||||
$(eval $(call install-file-as, $(d)/nix-profile.sh, $(profiledir)/nix.sh, 0644))
|
$(eval $(call install-file-as, $(d)/nix-profile.sh, $(profiledir)/nix.sh, 0644))
|
||||||
|
$(eval $(call install-file-as, $(d)/nix-profile-daemon.sh, $(profiledir)/nix-daemon.sh, 0644))
|
||||||
|
|
||||||
clean-files += $(nix_noinst_scripts)
|
clean-files += $(nix_noinst_scripts)
|
||||||
|
|
54
scripts/nix-profile-daemon.sh.in
Normal file
54
scripts/nix-profile-daemon.sh.in
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
# Only execute this file once per shell.
|
||||||
|
if [ -n "$__ETC_PROFILE_NIX_SOURCED" ]; then return; fi
|
||||||
|
__ETC_PROFILE_NIX_SOURCED=1
|
||||||
|
|
||||||
|
# Set up secure multi-user builds: non-root users build through the
|
||||||
|
# Nix daemon.
|
||||||
|
if [ "$USER" != root -o ! -w @localstatedir@/nix/db ]; then
|
||||||
|
export NIX_REMOTE=daemon
|
||||||
|
fi
|
||||||
|
|
||||||
|
export NIX_USER_PROFILE_DIR="@localstatedir@/nix/profiles/per-user/$USER"
|
||||||
|
export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile"
|
||||||
|
|
||||||
|
# Set up the per-user profile.
|
||||||
|
mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
|
||||||
|
if ! test -O "$NIX_USER_PROFILE_DIR"; then
|
||||||
|
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -w $HOME; then
|
||||||
|
if ! test -L $HOME/.nix-profile; then
|
||||||
|
if test "$USER" != root; then
|
||||||
|
ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
|
||||||
|
else
|
||||||
|
# Root installs in the system-wide profile by default.
|
||||||
|
ln -s @localstatedir@/nix/profiles/default $HOME/.nix-profile
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Subscribe the root user to the NixOS channel by default.
|
||||||
|
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
|
||||||
|
echo "https://nixos.org/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 -O "$NIX_USER_GCROOTS_DIR"; 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
|
||||||
|
rm -f $HOME/.nix-defexpr
|
||||||
|
mkdir -p $HOME/.nix-defexpr
|
||||||
|
if [ "$USER" != root ]; then
|
||||||
|
ln -s @localstatedir@/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
export NIX_SSL_CERT_FILE="@localstatedir@/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
||||||
|
export NIX_PATH="@localstatedir@/nix/profiles/per-user/root/channels"
|
||||||
|
export PATH="$HOME/.nix-profile/bin:$HOME/.nix-profile/lib/kde4/libexec:@localstatedir@/nix/profiles/default/bin:@localstatedir@/nix/profiles/default:@localstatedir@/nix/profiles/default/lib/kde4/libexec:$PATH"
|
Loading…
Reference in a new issue