diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-30 14:59:57 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-30 14:59:57 -0500 |
| commit | d7ffe327aeab94ad1c7a27ca0c83436b92ac60fa (patch) | |
| tree | 25cf09e48e5c42a320be1df2e4e9511883ad93ec /src/libstore/globals.cc | |
| parent | baaab2aab58aa3c47517d4ba9121a29a7ad73078 (diff) | |
| parent | a785b3eddf8c02750b1715939069d20980bd5125 (diff) | |
Merge remote-tracking branch 'origin/master' into fix-and-ci-static-builds
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index fa8799314..7aec6d1c0 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -35,7 +35,7 @@ Settings::Settings() , nixLibexecDir(canonPath(getEnv("NIX_LIBEXEC_DIR").value_or(NIX_LIBEXEC_DIR))) , nixBinDir(canonPath(getEnv("NIX_BIN_DIR").value_or(NIX_BIN_DIR))) , nixManDir(canonPath(NIX_MAN_DIR)) - , nixDaemonSocketFile(canonPath(nixStateDir + DEFAULT_SOCKET_PATH)) + , nixDaemonSocketFile(canonPath(getEnv("NIX_DAEMON_SOCKET_PATH").value_or(nixStateDir + DEFAULT_SOCKET_PATH))) { buildUsersGroup = getuid() == 0 ? "nixbld" : ""; lockCPU = getEnv("NIX_AFFINITY_HACK") == "1"; |