diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-08-11 13:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 13:01:36 +0200 |
| commit | 486e1c3c16b922818c182de37c9f21a6c2d5309a (patch) | |
| tree | 80088faa87f6d57fdbe12219ebea16f95deafea3 /pkgs/build-support | |
| parent | 3be89a675814c3c2dd21fc3102c71960e896b97c (diff) | |
| parent | 3270aa896bc78ee261c34137035d2705aba78440 (diff) | |
| download | nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.gz nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.bz2 nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.lz nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.xz nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.tar.zst nixlib-486e1c3c16b922818c182de37c9f21a6c2d5309a.zip | |
Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 8fe661026774..1b36f5f555da 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -1,4 +1,4 @@ -# On Mac OS X, binaries refer to dynamic library dependencies using +# On macOS, binaries refer to dynamic library dependencies using # either relative paths (e.g. "libicudata.dylib", searched relative to # $DYLD_LIBRARY_PATH) or absolute paths # (e.g. "/nix/store/.../lib/libicudata.dylib"). In Nix, the latter is diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh index e3a08b2598d9..cf8416c0838d 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh @@ -1,4 +1,4 @@ -# On Mac OS X, frameworks are linked to the system CoreFoundation but +# On macOS, frameworks are linked to the system CoreFoundation but # dynamic libraries built with nix use a pure version of CF this # causes segfaults for binaries that depend on it at runtime. This # can be solved in two ways. |