wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Merge pull request #12794 from obsidiansystems/fix-windows-build

Browse source 
Fix windows build
This commit is contained in:
John Ericson 2025-03-28 21:04:14 -04:00 • committed by GitHub
commit 3f13cc0f87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/local-store.cc
View file

@ -115,7 +115,7 @@ LocalStore::LocalStore(
state->stmts = std::make_unique<State::Stmts>(); state->stmts = std::make_unique<State::Stmts>();
/* Create missing state directories if they don't already exist. */ /* Create missing state directories if they don't already exist. */
createDirs(realStoreDir); createDirs(realStoreDir.get());
if (readOnly) { if (readOnly) {
experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore); experimentalFeatureSettings.require(Xp::ReadOnlyLocalStore);
} else { } else {

4
src/libutil/file-system.cc
View file

@ -477,12 +477,12 @@ void createDir(const Path & path, mode_t mode)
throw SysError("creating directory '%1%'", path); throw SysError("creating directory '%1%'", path);
} }
void createDirs(const Path & path) void createDirs(const fs::path & path)
{ {
try { try {
fs::create_directories(path); fs::create_directories(path);
} catch (fs::filesystem_error & e) { } catch (fs::filesystem_error & e) {
throw SysError("creating directory '%1%'", path); throw SysError("creating directory '%1%'", path.string());
} }
} }

9
src/libutil/file-system.hh
View file

@ -231,14 +231,9 @@ void deletePath(const std::filesystem::path & path, uint64_t & bytesFreed);
/** /**
* Create a directory and all its parents, if necessary. * Create a directory and all its parents, if necessary.
* *
* In the process of being deprecated for * Wrapper around `std::filesystem::create_directories` to handle exceptions.
* `std::filesystem::create_directories`.
*/ */
void createDirs(const Path & path); void createDirs(const std::filesystem::path & path);
inline void createDirs(PathView path)
{
return createDirs(Path(path));
}
/** /**
* Create a single directory. * Create a single directory.