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/development/libraries/opencv | |
| 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/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 \ |