Skip to content

libstore: add PersonalityArgs struct for setPersonality #15117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 1 commit into from
Jan 29, 2026
+24 −9
Merged

libstore: add PersonalityArgs struct for setPersonality #15117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/libstore/linux/include/nix/store/personality.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

namespace nix::linux {

void setPersonality(std::string_view system);
struct PersonalityArgs
{
std::string_view system;
bool impersonateLinux26;
};

}
void setPersonality(PersonalityArgs args);

} // namespace nix::linux
8 changes: 4 additions & 4 deletions src/libstore/linux/personality.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@

namespace nix::linux {

void setPersonality(std::string_view system)
void setPersonality(PersonalityArgs args)
{
/* Change the personality to 32-bit if we're doing an
i686-linux build on an x86_64-linux machine. */
struct utsname utsbuf;
uname(&utsbuf);
if ((system == "i686-linux"
if ((args.system == "i686-linux"
&& (std::string_view(NIX_LOCAL_SYSTEM) == "x86_64-linux"
|| (!strcmp(utsbuf.sysname, "Linux") && !strcmp(utsbuf.machine, "x86_64"))))
|| system == "armv7l-linux" || system == "armv6l-linux" || system == "armv5tel-linux") {
|| args.system == "armv7l-linux" || args.system == "armv6l-linux" || args.system == "armv5tel-linux") {
if (personality(PER_LINUX32) == -1)
throw SysError("cannot set 32-bit personality");
}

/* Impersonate a Linux 2.6 machine to get some determinism in
builds that depend on the kernel version. */
if ((system == "i686-linux" || system == "x86_64-linux") && settings.impersonateLinux26) {
if ((args.system == "i686-linux" || args.system == "x86_64-linux") && args.impersonateLinux26) {
int cur = personality(0xffffffff);
if (cur != -1)
personality(cur | 0x0020000 /* == UNAME26 */);
Expand Down
5 changes: 4 additions & 1 deletion src/libstore/unix/build/linux-derivation-builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ struct LinuxDerivationBuilder : virtual DerivationBuilderImpl
{
setupSeccomp();

linux::setPersonality(drv.platform);
linux::setPersonality({
.system = drv.platform,
.impersonateLinux26 = settings.impersonateLinux26,
});
}
};

Expand Down
10 changes: 8 additions & 2 deletions src/nix/run.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ void execProgramInStore(

#ifdef __linux__
if (system)
linux::setPersonality(*system);
linux::setPersonality({
.system = *system,
.impersonateLinux26 = settings.impersonateLinux26,
});
#endif

if (useLookupPath == UseLookupPath::Use) {
Expand Down Expand Up @@ -251,7 +254,10 @@ void chrootHelper(int argc, char ** argv)

# ifdef __linux__
if (system != "")
linux::setPersonality(system);
linux::setPersonality({
.system = system,
.impersonateLinux26 = settings.impersonateLinux26,
});
# endif

execvp(cmd.c_str(), stringsToCharPtrs(args).data());
Expand Down
Loading