about summary refs log tree commit diff
diff options
context:
space:
mode:
authordavidak <git@davidak.de>2017-07-30T10·28+0200
committerdavidak <git@davidak.de>2017-07-30T10·28+0200
commitfcb8d6a7a088622022364bde6534b2e4e804e4ed (patch)
tree9a9e1cdf922d88cae82100a7005a45c38677502b
parent92bcb61127abd9da6ee1c11a53bf7b8da72f0c57 (diff)
replace "OS X" with "macOS"
-rw-r--r--src/build-remote/build-remote.cc2
-rw-r--r--src/libstore/optimise-store.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index 8719959f0b69..7455160c7325 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 8e8002a30db5..ba1ebc370fcf 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