diff options
| author | regnat <rg@regnat.ovh> | 2020-07-02 17:18:03 +0200 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2020-07-03 09:20:01 +0200 |
| commit | 223fbe644a4cde45269c01e971331d9414971d46 (patch) | |
| tree | 8996313d00c6ee38b732f43f8d096a7279219ff5 /src/libstore/globals.cc | |
| parent | 5101ed18bca509a8cf43668b0701afad90c5c9c4 (diff) | |
Shorten the path to the test root
Fix a socket length failure on the OSX builders
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 bee94cbd8..683fa5196 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"; |