wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Read per-user settings from ~/.config/nix/nix.conf

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-20 14:58:16 +02:00
parent 562585e901
commit f05d5f89ff
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
8 changed files with 70 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/globals.cc
View file

@ -53,19 +53,19 @@ Settings::Settings()
void Settings::loadConfFile()
{
applyConfigFile(nixConfDir + "/nix.conf");
/* We only want to send overrides to the daemon, i.e. stuff from
~/.nix/nix.conf or the command line. */
resetOverriden();
applyConfigFile(getConfigDir() + "/nix/nix.conf");
}
void Settings::set(const string & name, const string & value)
{
overrides[name] = value;
Config::set(name, value);
}
StringMap Settings::getOverrides()
{
return overrides;
}
unsigned int Settings::getDefaultCores()
{
return std::max(1U, std::thread::hardware_concurrency());