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 [...]"
This commit is contained in:
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user