lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

util.hh: Move nativeSystem to local-derivation-goal.cc

Browse source 
Change-Id: I74565fbfd3aeedef8f50465808fac712b84e47ad
This commit is contained in:
Tom Hubrecht 2024-05-28 16:27:48 +02:00
parent d73c40ff3d
commit f0eb650ee8
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build/local-derivation-goal.cc
View file

@ -64,6 +64,11 @@ extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags,
namespace nix { namespace nix {
/**
* The system for which Nix is compiled.
*/
constexpr std::string_view nativeSystem = SYSTEM;
void handleDiffHook( void handleDiffHook(
uid_t uid, uid_t gid, uid_t uid, uid_t gid,
const Path & tryA, const Path & tryB, const Path & tryA, const Path & tryB,

2
src/libutil/error.cc
View file

@ -10,8 +10,6 @@
namespace nix { namespace nix {
const std::string nativeSystem = SYSTEM;
void BaseError::addTrace(std::shared_ptr<Pos> && e, HintFmt hint) void BaseError::addTrace(std::shared_ptr<Pos> && e, HintFmt hint)
{ {
err.traces.push_front(Trace { .pos = std::move(e), .hint = hint }); err.traces.push_front(Trace { .pos = std::move(e), .hint = hint });

5
src/libutil/util.hh
View file

@ -33,11 +33,6 @@ namespace nix {
struct Sink; struct Sink;
struct Source; struct Source;
/**
* The system for which Nix is compiled.
*/
extern const std::string nativeSystem;