public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv: remove cf-private

This commit is contained in:
Daiderd Jordan 2019-06-19 20:14:17 +02:00
parent ecf667b34a
commit 2f9a546b96
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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, VideoDecodeAcceleration, bzip2 , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}: }:
let let
@ -206,7 +206,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 VideoDecodeAcceleration bzip2 ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
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, VideoDecodeAcceleration, bzip2 , 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 VideoDecodeAcceleration bzip2 ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
pkgs/development/libraries/opencv/default.nix
View File

@ -10,7 +10,7 @@
, enableFfmpeg ? false, ffmpeg , enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1 , enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen , enableEigen ? true, eigen
, cf-private, Cocoa, QTKit , Cocoa, QTKit
}: }:
let let
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ] ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
; ;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

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

@ -12516,12 +12516,10 @@ in
openct = callPackage ../development/libraries/openct { }; openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv { opencv = callPackage ../development/libraries/opencv {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; inherit (darwin.apple_sdk.frameworks) Cocoa QTKit;
}; };
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
}; };
@ -12530,7 +12528,6 @@ in
}; };
opencv4 = callPackage ../development/libraries/opencv/4.x.nix { opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
}; };