diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07T22·55+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07T22·55+0100 |
commit | 28bba8c44f484eae38e8a15dcec73cfa999156f6 (patch) | |
tree | f5e009a14192dc56a741703d08c622cf7236dc5b /src/libstore/globals.cc | |
parent | 8057a192e3254c936fa0bcb5715e09600a28e8f8 (diff) |
Prevent config.h from being clobbered
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r-- | src/libstore/globals.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index b5a2a20bee44..596d4774ca4d 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -10,14 +10,6 @@ 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; @@ -66,7 +58,6 @@ 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") { |