diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-31T08·31+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-31T08·31+0200 |
| commit | a2778988f2b70a5f000202afa7213b553350c72e (patch) | |
| tree | 34d3273caa322a0928f683ecc836423c33c1b8b8 /src/libstore | |
| parent | 561e977f51c1d9ec55e4a70791958d4e214df465 (diff) | |
| parent | fcb8d6a7a088622022364bde6534b2e4e804e4ed (diff) | |
Merge branch 'macOS' of https://github.com/davidak/nix
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/optimise-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 4461fc6dd70d..462f8e72a8d1 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -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 |