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

Use std::filesystem::path instead of Path in libexpr.

Browse source
This commit is contained in:
Ubuntu 2025-11-26 00:22:26 +00:00
parent 84079e10cf
commit 697b068756
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