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

Merge pull request #14649 from vinayakankugoyal/path

Browse source 
Use std::filesystem::path instead of Path in libexpr.
This commit is contained in:
John Ericson 2025-11-26 01:23:16 +00:00 • committed by GitHub
commit 31ce0c8169
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/eval-settings.cc
View file

@ -103,9 +103,9 @@ const std::string & EvalSettings::getCurrentSystem() const
return evalSystem != "" ? evalSystem : settings.thisSystem.get();
}
Path getNixDefExpr()
std::filesystem::path getNixDefExpr()
{
return settings.useXDGBaseDirectories ? getStateDir() + "/defexpr" : getHome() + "/.nix-defexpr";
return settings.useXDGBaseDirectories ? getStateDir() / "defexpr" : getHome() / ".nix-defexpr";
}
} // namespace nix

2
src/libexpr/include/nix/expr/eval-settings.hh
View file

@ -366,6 +366,6 @@ struct EvalSettings : Config
/**
* Conventionally part of the default nix path in impure mode.
*/
Path getNixDefExpr();
std::filesystem::path getNixDefExpr();
} // namespace nix