wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Merge pull request #12937 from roberth/undefined-macros

Browse source 
Fix undefined macro errors
This commit is contained in:
mergify[bot] 2025-04-06 16:25:22 +00:00 • committed by GitHub
commit a56aaf26c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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(); StringSet levels = computeLevels();
for (auto iter = levels.begin(); iter != levels.end(); ++iter) for (auto iter = levels.begin(); iter != levels.end(); ++iter)
extraPlatforms.insert(*iter + "-linux"); extraPlatforms.insert(*iter + "-linux");
#elif __APPLE__ #elif defined(__APPLE__)
// Rosetta 2 emulation layer can run x86_64 binaries on aarch64 // Rosetta 2 emulation layer can run x86_64 binaries on aarch64
// machines. Note that we can’t force processes from executing // machines. Note that we can’t force processes from executing
// x86_64 in aarch64 environments or vice versa since they can // 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__ #ifdef __linux__
static bool b = (settings.buildUsersGroup != "" || settings.autoAllocateUids) && isRootUser(); static bool b = (settings.buildUsersGroup != "" || settings.autoAllocateUids) && isRootUser();
return b; return b;
#elif __APPLE__ #elif defined(__APPLE__)
static bool b = settings.buildUsersGroup != "" && isRootUser(); static bool b = settings.buildUsersGroup != "" && isRootUser();
return b; return b;
#else #else

2
src/libutil/current-process.cc
View file

@ -108,7 +108,7 @@ std::optional<Path> getSelfExe()
{ {
#if defined(__linux__) || defined(__GNU__) #if defined(__linux__) || defined(__GNU__)
return readLink("/proc/self/exe"); return readLink("/proc/self/exe");
#elif __APPLE__ #elif defined(__APPLE__)
char buf[1024]; char buf[1024];
uint32_t size = sizeof(buf); uint32_t size = sizeof(buf);
if (_NSGetExecutablePath(buf, &size) == 0) if (_NSGetExecutablePath(buf, &size) == 0)