Merge pull request #25219 from knedlsepp/fix-opencv3-darwin

opencv3: Enable darwin build

authored by Daiderd Jordan and committed by GitHub 390e2ea1 3156ef2d

+9 -5
+6 -4
pkgs/development/libraries/opencv/3.x.nix
··· 4 4 , enablePNG ? true, libpng 5 5 , enableTIFF ? true, libtiff 6 6 , enableWebP ? true, libwebp 7 - , enableEXR ? true, openexr, ilmbase 7 + , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase 8 8 , enableJPEG2K ? true, jasper 9 9 10 10 , enableIpp ? false ··· 16 16 , enableGStreamer ? false, gst_all_1 17 17 , enableEigen ? false, eigen 18 18 , enableCuda ? false, cudatoolkit, gcc5 19 + , AVFoundation, Cocoa, QTKit 19 20 }: 20 21 21 22 let ··· 115 116 ++ lib.optional enableEigen eigen 116 117 ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] 117 118 ++ lib.optional enableContrib protobuf3_1 118 - ; 119 + ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; 119 120 120 121 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; 121 122 ··· 134 135 (opencvFlag "CUDA" enableCuda) 135 136 (opencvFlag "CUBLAS" enableCuda) 136 137 ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] 137 - ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"; 138 + ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off" 139 + ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; 138 140 139 141 enableParallelBuilding = true; 140 142 ··· 147 149 homepage = http://opencv.org/; 148 150 license = stdenv.lib.licenses.bsd3; 149 151 maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter]; 150 - platforms = with stdenv.lib.platforms; linux; 152 + platforms = with stdenv.lib.platforms; linux ++ darwin; 151 153 }; 152 154 }
+3 -1
pkgs/top-level/all-packages.nix
··· 9326 9326 ffmpeg = ffmpeg_2; 9327 9327 }; 9328 9328 9329 - opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; 9329 + opencv3 = callPackage ../development/libraries/opencv/3.x.nix { 9330 + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; 9331 + }; 9330 9332 9331 9333 # this ctl version is needed by openexr_viewers 9332 9334 openexr_ctl = ctl;