diff options
| author | Rebecca Turner <rbt@sent.as> | 2024-08-25 11:58:55 -0700 |
|---|---|---|
| committer | Rebecca Turner <rbt@sent.as> | 2024-08-25 15:54:22 -0700 |
| commit | 690f07272e58bfe86d12adb0bd6c81c031f930fd (patch) | |
| tree | e01efa0e48d38eb44eb1d3445719a6adab29a33a /src/libstore | |
| parent | 5fc6fcb31035f79a8e590f07d73dc6cc592e9e29 (diff) | |
Support relative and `~/` paths in config settings
Change-Id: I5566a9858ba255f4ac5051d1368c7dfb24460f0a
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/globals.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index ab461e739..29ec60105 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -131,8 +131,9 @@ void loadConfFile() globalConfig.resetOverridden(); auto files = settings.nixUserConfFiles; + auto home = getHome(); for (auto file = files.rbegin(); file != files.rend(); file++) { - applyConfigFile(ApplyConfigOptions{.path = *file}); + applyConfigFile(ApplyConfigOptions{.path = *file, .home = home}); } auto nixConfEnv = getEnv("NIX_CONFIG"); |