diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-02-18T22·05+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-19T09·19+0100 |
commit | 3e067ac11c1621f989011432f619652a9c20e6f4 (patch) | |
tree | 4c26c31ab8e793481492ca1c1dd7b85ffd8f116e /src/libstore/globals.cc | |
parent | 5ea138dc4b9822095723b75bc2962e3d899f5437 (diff) |
Add `Settings::nixDaemonSocketFile'.
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r-- | src/libstore/globals.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 596d4774ca4d..b5a2a20bee44 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -10,6 +10,14 @@ namespace nix { +/* The default location of the daemon socket, relative to nixStateDir. + The socket is in a directory to allow you to control access to the + Nix daemon by setting the mode/ownership of the directory + appropriately. (This wouldn't work on the socket itself since it + must be deleted and recreated on startup.) */ +#define DEFAULT_SOCKET_PATH "/daemon-socket/socket" + + Settings settings; @@ -58,6 +66,7 @@ void Settings::processEnvironment() 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)); + nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH); string subs = getEnv("NIX_SUBSTITUTERS", "default"); if (subs == "default") { |