diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-01T22·07+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-01T22·07+0000 |
| commit | a37338815de6affd44f927712143f626c8e6d79d (patch) | |
| tree | e3ea2dbd932702a06110c33a26c94da3e1094e92 /src/libmain | |
| parent | 2e6bf723e4d63d661d26443a4477a040a96c7257 (diff) | |
* A GC setting `gc-keep-outputs' to specify whether output paths of
derivations should be kept.
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libmain/shared.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am index 3c28441ca166..aa5f673fd2f7 100644 --- a/src/libmain/Makefile.am +++ b/src/libmain/Makefile.am @@ -7,5 +7,6 @@ AM_CXXFLAGS = \ -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ + -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_VERSION=\"$(VERSION)\" \ -I.. ${aterm_include} -I../libutil -I../libstore diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 5c994d7b47af..0a6ebcd5c225 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -106,6 +106,7 @@ static void initAndRun(int argc, char * * argv) 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)); /* Check that the store directory and its parent are not symlinks. */ |