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

Merge "store: add a hint on how to fix Lix installs broken by macOS Sequoia" into main

Browse source
This commit is contained in:
jade 2024-09-14 19:28:24 +00:00 committed by Gerrit Code Review
parent 8f88590d13 b7fc37b015
commit 5246cea6c8
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/lock.cc
View file

@ -73,8 +73,16 @@ struct SimpleUserLock : UserLock
debug("trying user '%s'", i); debug("trying user '%s'", i);
struct passwd * pw = getpwnam(i.c_str()); struct passwd * pw = getpwnam(i.c_str());
if (!pw) if (!pw) {
throw Error("the user '%s' in the group '%s' does not exist", i, settings.buildUsersGroup); #ifdef __APPLE__
#define APPLE_HINT "\n\nhint: this may be caused by an update to macOS Sequoia breaking existing Lix installations.\n" \
"See the macOS Sequoia page on the Lix wiki for detailed repair instructions: https://wiki.lix.systems/link/81"
#else
#define APPLE_HINT
#endif
throw Error("the user '%s' in the group '%s' does not exist" APPLE_HINT, i, settings.buildUsersGroup);
#undef APPLE_HINT
}
auto fnUserLock = fmt("%s/userpool/%s", settings.nixStateDir,pw->pw_uid); auto fnUserLock = fmt("%s/userpool/%s", settings.nixStateDir,pw->pw_uid);