diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-07-27T15·14+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-08-10T16·05+0200 |
| commit | 2fad86f361d5f6a4896a0364e313f61384945111 (patch) | |
| tree | c3f119f5260845e5bae15db6c32090521ff3e719 /src | |
| parent | be64fbb50129356a03d8b7fe08d3ef3809a4a82a (diff) | |
Remove $NIX_DB_DIR
This variable has no reason to exist, given $NIX_STATE_DIR.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmain/shared.cc | 1 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 1 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 3 | ||||
| -rw-r--r-- | src/libstore/local-store.cc | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 515d80091de3..5af7c46e86da 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -252,7 +252,6 @@ void printVersion(const string & programName) std::cout << "Configuration file: " << settings.nixConfDir + "/nix.conf" << "\n"; std::cout << "Store directory: " << settings.nixStore << "\n"; std::cout << "State directory: " << settings.nixStateDir << "\n"; - std::cout << "Database directory: " << settings.nixDBPath << "\n"; } throw Exit(); } diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index c12178e4028a..7bf48be378f8 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -69,7 +69,6 @@ void Settings::processEnvironment() nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR)); nixLogDir = canonPath(getEnv("NIX_LOG_DIR", NIX_LOG_DIR)); nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR)); - nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db"); nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR)); nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)); nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 65f763ace3c7..3194193bc842 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -51,9 +51,6 @@ struct Settings { /* The directory where state is stored. */ Path nixStateDir; - /* The directory where we keep the SQLite database. */ - Path nixDBPath; - /* The directory where configuration files are stored. */ Path nixConfDir; diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 96ce6a0d893b..f9610912307d 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -39,7 +39,7 @@ namespace nix { LocalStore::LocalStore(const Params & params) : LocalFSStore(params) , realStoreDir(get(params, "real", storeDir)) - , dbDir(get(params, "state", "") != "" ? get(params, "state", "") + "/db" : settings.nixDBPath) + , dbDir(stateDir + "/db") , linksDir(realStoreDir + "/.links") , reservedPath(dbDir + "/reserved") , schemaPath(dbDir + "/schema") |