diff options
| author | davidak <git@davidak.de> | 2017-08-07 00:05:18 +0200 |
|---|---|---|
| committer | davidak <git@davidak.de> | 2017-08-07 21:41:30 +0200 |
| commit | 3270aa896bc78ee261c34137035d2705aba78440 (patch) | |
| tree | 01c1f1bca1cd4bd6aedaca8114d6e980612beb53 /pkgs/development/libraries/opencv | |
| parent | ff9479cd543545899cfd6cc20bb446e5a6bf4603 (diff) | |
| download | nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar.gz nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar.bz2 nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar.lz nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar.xz nixlib-3270aa896bc78ee261c34137035d2705aba78440.tar.zst nixlib-3270aa896bc78ee261c34137035d2705aba78440.zip | |
replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016 https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop exception are parts refering to older versions of macOS like "GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0443d00a258d..29d0a1a3a4cd 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -37,7 +37,7 @@ let sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; }; - # This fixes the build on OS X. + # This fixes the build on macOS. # See: https://github.com/opencv/opencv_contrib/pull/926 contribOSXFix = fetchpatch { url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch"; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { (lib.optionalString enableContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" - # This fixes the build on OS X. + # This fixes the build on macOS. patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}" for name in vgg_generated_48.i \ |