nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-22 02:09:36 +01:00
Code Activity

Fix undefined macro errors

Browse source 
(cherry picked from commit 77b4bb74d5)
This commit is contained in:
Robert Hensing 2025-04-06 17:43:10 +02:00 • committed by Mergify
parent 1b119ded3a
commit 3bb46b73a8
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/globals.cc
View file

@ -209,7 +209,7 @@ StringSet Settings::getDefaultExtraPlatforms()
StringSet levels = computeLevels();
for (auto iter = levels.begin(); iter != levels.end(); ++iter)
extraPlatforms.insert(*iter + "-linux");
#elif __APPLE__
#elif defined(__APPLE__)
// Rosetta 2 emulation layer can run x86_64 binaries on aarch64
// machines. Note that we can’t force processes from executing
// x86_64 in aarch64 environments or vice versa since they can

2
src/libstore/unix/user-lock.cc
View file

@ -196,7 +196,7 @@ bool useBuildUsers()
#ifdef __linux__
static bool b = (settings.buildUsersGroup != "" || settings.autoAllocateUids) && isRootUser();
return b;
#elif __APPLE__
#elif defined(__APPLE__)
static bool b = settings.buildUsersGroup != "" && isRootUser();
return b;
#else