Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

opencv: add cf-private on darwin

Undefined symbols for architecture x86_64:
"_NSDefaultRunLoopMode", referenced from:
_cvWaitKey in window_cocoa.mm.o
"_OBJC_CLASS_$_NSDate", referenced from:
objc-class-ref in window_cocoa.mm.o
objc-class-ref in cap_qtkit.mm.o
"_OBJC_CLASS_$_NSDictionary", referenced from:
objc-class-ref in window_cocoa.mm.o
objc-class-ref in cap_qtkit.mm.o
"_OBJC_CLASS_$_NSMutableDictionary", referenced from:
objc-class-ref in window_cocoa.mm.o
"_OBJC_CLASS_$_NSRunLoop", referenced from:
objc-class-ref in cap_qtkit.mm.o
"_OBJC_CLASS_$_NSTimer", referenced from:
objc-class-ref in cap_qtkit.mm.o
ld: symbol(s) not found for architecture x86_64

+4 -2
+2 -2
pkgs/development/libraries/opencv/default.nix
··· 10 10 , enableFfmpeg ? false, ffmpeg 11 11 , enableGStreamer ? false, gst_all_1 12 12 , enableEigen ? true, eigen 13 - , darwin 13 + , cf-private, Cocoa, QTKit 14 14 }: 15 15 16 16 let ··· 54 54 ++ lib.optional enableFfmpeg ffmpeg 55 55 ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) 56 56 ++ lib.optional enableEigen eigen 57 - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) 57 + ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ] 58 58 ; 59 59 60 60 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
+2
pkgs/top-level/all-packages.nix
··· 11626 11626 11627 11627 opencv = callPackage ../development/libraries/opencv { 11628 11628 ffmpeg = ffmpeg_2; 11629 + inherit (darwin) cf-private; 11630 + inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; 11629 11631 }; 11630 11632 11631 11633 opencv3 = callPackage ../development/libraries/opencv/3.x.nix {