nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-11 11:31:03 +01:00
Code Activity

Fix mingw build

Browse source
This commit is contained in:
Eelco Dolstra 2025-12-03 19:46:56 +01:00
parent 96d8b54e42
commit c338f9cc5d
16 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/globals.cc
View file

@ -116,7 +116,7 @@ void loadConfFile(AbstractConfig & config)
}
};
applyConfigFile(settings.nixConfDir + "/nix.conf");
applyConfigFile((settings.nixConfDir / "nix.conf").string());
/* We only want to send overrides to the daemon, i.e. stuff from
~/.nix/nix.conf or the command line. */
@ -145,7 +145,7 @@ std::vector<Path> getUserConfigFiles()
std::vector<Path> files;
auto dirs = getConfigDirs();
for (auto & dir : dirs) {
files.insert(files.end(), dir + "/nix.conf");
files.insert(files.end(), (dir / "nix.conf").string());
}
return files;
}

2
src/libstore/nar-info-disk-cache.cc
View file

@ -86,7 +86,7 @@ public:
Sync<State> _state;
NarInfoDiskCacheImpl(Path dbPath = getCacheDir() + "/binary-cache-v7.sqlite")
NarInfoDiskCacheImpl(Path dbPath = (getCacheDir() / "binary-cache-v7.sqlite").string())
{
auto state(_state.lock());