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

3 files changed, 4 insertions, 4 deletions

diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index d433e24913f7..4b7a24d03e9a 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -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;
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
diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index be527450c464..51b57a8f4e97 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -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))