diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-15 13:00:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 13:00:28 +0200 |
| commit | a118293bd017ea6122ae3a6238a5cf24c7fb94bc (patch) | |
| tree | 50616a60b7f37379ec954d72fcedc3ba81788d87 /src/libmain | |
| parent | 512753f8247b927b62fd9391ee5ba6dda29ea4d4 (diff) | |
| parent | 895516cadf0739dd8359a38d503e0aaf5068dc4b (diff) | |
Merge pull request #3458 from zimbatm/nix-user-conf-dir
NIX_USER_CONF_FILES
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/shared.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 72ba717e5..8586257bf 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -260,7 +260,10 @@ void printVersion(const string & programName) cfg.push_back("signed-caches"); #endif std::cout << "Features: " << concatStringsSep(", ", cfg) << "\n"; - std::cout << "Configuration file: " << settings.nixConfDir + "/nix.conf" << "\n"; + std::cout << "System configuration file: " << settings.nixConfDir + "/nix.conf" << "\n"; + std::cout << "User configuration files: " << + concatStringsSep(":", settings.nixUserConfFiles) + << "\n"; std::cout << "Store directory: " << settings.nixStore << "\n"; std::cout << "State directory: " << settings.nixStateDir << "\n"; } |