wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Merge branch 'macOS' of https://github.com/davidak/nix

Browse source
This commit is contained in:
Eelco Dolstra 2017-07-31 10:31:51 +02:00
commit a2778988f2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/build-remote/build-remote.cc
View file

@ -57,7 +57,7 @@ int main (int argc, char * * argv)
settings.builders = argv[5];
/* It would be more appropriate to use $XDG_RUNTIME_DIR, since
that gets cleared on reboot, but it wouldn't work on OS X. */
that gets cleared on reboot, but it wouldn't work on macOS. */
currentLoad = settings.nixStateDir + "/current-load";
std::shared_ptr<Store> sshStore;

4
src/libstore/optimise-store.cc
View file

@ -98,14 +98,14 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa
throw SysError(format("getting attributes of path '%1%'") % path);
#if __APPLE__
/* HFS/OS X has some undocumented security feature disabling hardlinking for
/* HFS/macOS has some undocumented security feature disabling hardlinking for
special files within .app dirs. *.app/Contents/PkgInfo and
*.app/Contents/Resources/\*.lproj seem to be the only paths affected. See
https://github.com/NixOS/nix/issues/1443 for more discussion. */
if (std::regex_search(path, std::regex("\\.app/Contents/PkgInfo$")) ||
std::regex_search(path, std::regex("\\.app/Contents/Resources/.+\\.lproj$"))) {
debug(format("'%1%' is not allowed to be linked in OS X") % path);
debug(format("'%1%' is not allowed to be linked in macOS") % path);
return;
}
#endif

2
src/libutil/archive.cc
View file

@ -72,7 +72,7 @@ static void dump(const Path & path, Sink & sink, PathFilter & filter)
else if (S_ISDIR(st.st_mode)) {
sink << "type" << "directory";
/* If we're on a case-insensitive system like Mac OS X, undo
/* If we're on a case-insensitive system like macOS, undo
the case hack applied by restorePath(). */
std::map<string, string> unhacked;
for (auto & i : readDirectory(path))