nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-30 08:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv: disable QTKit backend

Browse Source 
QTKit was removed in macOS 10.12
This commit is contained in:
Matthew Bauer 2019-06-06 00:59:44 -04:00
parent eb189808c4
commit 9a0ced7e45
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/opencv/3.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394 , enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox , enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 , cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}: }:
let let
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb ++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit ++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@ -237,6 +237,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF" "-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF" "-DWITH_LAPACK=OFF"
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [ ] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON" "-DOPENCV_SKIP_PYTHON_LOADER=ON"
]; ];

5
pkgs/development/libraries/opencv/4.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394 , enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox , enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 , cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}: }:
let let
@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb ++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit ++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@ -251,6 +251,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF" "-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF" "-DWITH_LAPACK=OFF"
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [ ] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON" "-DOPENCV_SKIP_PYTHON_LOADER=ON"
]; ];

4
pkgs/top-level/all-packages.nix
View File

@ -12427,7 +12427,7 @@ in
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
}; };
opencv3WithoutCuda = opencv3.override { opencv3WithoutCuda = opencv3.override {
@ -12436,7 +12436,7 @@ in
opencv4 = callPackage ../development/libraries/opencv/4.x.nix { opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
}; };
openexr = callPackage ../development/libraries/openexr { }; openexr = callPackage ../development/libraries/openexr { };