forked from lix-project/lix
nix-env: Create ~/.nix-profile automatically
This commit is contained in:
parent
26762ceb86
commit
9348f9291e
|
@ -6,15 +6,6 @@ export NIX_USER_PROFILE_DIR="@localstatedir@/nix/profiles/per-user/$USER"
|
||||||
export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile"
|
export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile"
|
||||||
|
|
||||||
if test -w $HOME; then
|
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
|
|
||||||
|
|
||||||
# Set up a default Nix expression from which to install stuff.
|
# Set up a default Nix expression from which to install stuff.
|
||||||
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
||||||
rm -f $HOME/.nix-defexpr
|
rm -f $HOME/.nix-defexpr
|
||||||
|
|
|
@ -10,18 +10,6 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
|
||||||
NIX_USER_PROFILE_DIR=@localstatedir@/nix/profiles/per-user/$USER
|
NIX_USER_PROFILE_DIR=@localstatedir@/nix/profiles/per-user/$USER
|
||||||
|
|
||||||
if [ -w "$HOME" ]; then
|
if [ -w "$HOME" ]; then
|
||||||
if ! [ -L "$NIX_LINK" ]; then
|
|
||||||
echo "Nix: creating $NIX_LINK" >&2
|
|
||||||
if [ "$USER" != root ]; then
|
|
||||||
if ! ln -s "$NIX_USER_PROFILE_DIR"/profile "$NIX_LINK"; then
|
|
||||||
echo "Nix: WARNING: could not create $NIX_LINK -> $NIX_USER_PROFILE_DIR/profile" >&2
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# Root installs in the system-wide profile by default.
|
|
||||||
ln -s @localstatedir@/nix/profiles/default "$NIX_LINK"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set up a default Nix expression from which to install stuff.
|
# Set up a default Nix expression from which to install stuff.
|
||||||
__nix_defexpr="$HOME"/.nix-defexpr
|
__nix_defexpr="$HOME"/.nix-defexpr
|
||||||
[ -L "$__nix_defexpr" ] && rm -f "$__nix_defexpr"
|
[ -L "$__nix_defexpr" ] && rm -f "$__nix_defexpr"
|
||||||
|
|
|
@ -70,16 +70,17 @@ LocalStore::LocalStore(const Params & params)
|
||||||
createSymlink(profilesDir, gcRootsDir + "/profiles");
|
createSymlink(profilesDir, gcRootsDir + "/profiles");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Optionally, create directories and set permissions for a
|
|
||||||
multi-user install. */
|
|
||||||
if (getuid() == 0 && settings.buildUsersGroup != "") {
|
|
||||||
|
|
||||||
for (auto & perUserDir : {profilesDir + "/per-user", gcRootsDir + "/per-user"}) {
|
for (auto & perUserDir : {profilesDir + "/per-user", gcRootsDir + "/per-user"}) {
|
||||||
createDirs(perUserDir);
|
createDirs(perUserDir);
|
||||||
if (chmod(perUserDir.c_str(), 0755) == -1)
|
if (chmod(perUserDir.c_str(), 0755) == -1)
|
||||||
throw SysError("could not set permissions on '%s' to 755", perUserDir);
|
throw SysError("could not set permissions on '%s' to 755", perUserDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
createUser(getUserName(), getuid());
|
||||||
|
|
||||||
|
/* Optionally, create directories and set permissions for a
|
||||||
|
multi-user install. */
|
||||||
|
if (getuid() == 0 && settings.buildUsersGroup != "") {
|
||||||
mode_t perm = 01775;
|
mode_t perm = 01775;
|
||||||
|
|
||||||
struct group * gr = getgrnam(settings.buildUsersGroup.get().c_str());
|
struct group * gr = getgrnam(settings.buildUsersGroup.get().c_str());
|
||||||
|
|
|
@ -475,6 +475,16 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
std::string getUserName()
|
||||||
|
{
|
||||||
|
auto pw = getpwuid(geteuid());
|
||||||
|
std::string name = pw ? pw->pw_name : getEnv("USER", "");
|
||||||
|
if (name.empty())
|
||||||
|
throw Error("cannot figure out user name");
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static Lazy<Path> getHome2([]() {
|
static Lazy<Path> getHome2([]() {
|
||||||
Path homeDir = getEnv("HOME");
|
Path homeDir = getEnv("HOME");
|
||||||
if (homeDir.empty()) {
|
if (homeDir.empty()) {
|
||||||
|
|
|
@ -126,6 +126,8 @@ void deletePath(const Path & path, unsigned long long & bytesFreed);
|
||||||
Path createTempDir(const Path & tmpRoot = "", const Path & prefix = "nix",
|
Path createTempDir(const Path & tmpRoot = "", const Path & prefix = "nix",
|
||||||
bool includePid = true, bool useGlobalCounter = true, mode_t mode = 0755);
|
bool includePid = true, bool useGlobalCounter = true, mode_t mode = 0755);
|
||||||
|
|
||||||
|
std::string getUserName();
|
||||||
|
|
||||||
/* Return $HOME or the user's home directory from /etc/passwd. */
|
/* Return $HOME or the user's home directory from /etc/passwd. */
|
||||||
Path getHome();
|
Path getHome();
|
||||||
|
|
||||||
|
|
|
@ -159,13 +159,7 @@ static int _main(int argc, char ** argv)
|
||||||
nixDefExpr = home + "/.nix-defexpr";
|
nixDefExpr = home + "/.nix-defexpr";
|
||||||
|
|
||||||
// Figure out the name of the channels profile.
|
// Figure out the name of the channels profile.
|
||||||
;
|
profile = fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName());
|
||||||
auto pw = getpwuid(geteuid());
|
|
||||||
std::string name = pw ? pw->pw_name : getEnv("USER", "");
|
|
||||||
if (name.empty())
|
|
||||||
throw Error("cannot figure out user name");
|
|
||||||
profile = settings.nixStateDir + "/profiles/per-user/" + name + "/channels";
|
|
||||||
createDirs(dirOf(profile));
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
cNone,
|
cNone,
|
||||||
|
|
|
@ -1422,9 +1422,14 @@ static int _main(int argc, char * * argv)
|
||||||
|
|
||||||
if (globals.profile == "") {
|
if (globals.profile == "") {
|
||||||
Path profileLink = getHome() + "/.nix-profile";
|
Path profileLink = getHome() + "/.nix-profile";
|
||||||
globals.profile = pathExists(profileLink)
|
if (!pathExists(profileLink)) {
|
||||||
? absPath(readLink(profileLink), dirOf(profileLink))
|
replaceSymlink(
|
||||||
: canonPath(settings.nixStateDir + "/profiles/default");
|
getuid() == 0
|
||||||
|
? settings.nixStateDir + "/profiles/default"
|
||||||
|
: fmt("%s/profiles/per-user/%s/profile", settings.nixStateDir, getUserName()),
|
||||||
|
profileLink);
|
||||||
|
}
|
||||||
|
globals.profile = absPath(readLink(profileLink), dirOf(profileLink));
|
||||||
}
|
}
|
||||||
|
|
||||||
op(globals, opFlags, opArgs);
|
op(globals, opFlags, opArgs);
|
||||||
|
|
|
@ -36,7 +36,7 @@ grep -q 'item.*attrPath="foo".*name="dependencies"' $TEST_ROOT/meta.xml
|
||||||
|
|
||||||
# Do an install.
|
# Do an install.
|
||||||
nix-env -i dependencies
|
nix-env -i dependencies
|
||||||
[ -e $TEST_ROOT/var/nix/profiles/default/foobar ]
|
[ -e $TEST_HOME/.nix-profile/foobar ]
|
||||||
|
|
||||||
clearProfiles
|
clearProfiles
|
||||||
rm -f $TEST_HOME/.nix-channels
|
rm -f $TEST_HOME/.nix-channels
|
||||||
|
@ -55,5 +55,5 @@ grep -q 'item.*attrPath="foo".*name="dependencies"' $TEST_ROOT/meta.xml
|
||||||
|
|
||||||
# Do an install.
|
# Do an install.
|
||||||
nix-env -i dependencies
|
nix-env -i dependencies
|
||||||
[ -e $TEST_ROOT/var/nix/profiles/default/foobar ]
|
[ -e $TEST_HOME/.nix-profile/foobar ]
|
||||||
|
|
||||||
|
|
|
@ -7,5 +7,3 @@ rm -rf $TEST_HOME $TEST_ROOT/profile-var
|
||||||
mkdir -p $TEST_HOME
|
mkdir -p $TEST_HOME
|
||||||
USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh; set"
|
USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh; set"
|
||||||
USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh" # test idempotency
|
USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh" # test idempotency
|
||||||
|
|
||||||
[ -L $TEST_HOME/.nix-profile ]
|
|
||||||
|
|
Loading…
Reference in a new issue