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

opencv3: enable contrib by default

Browse Source
This commit is contained in:
Nikolay Amiantov 2018-02-25 22:07:46 +03:00
parent 9c14e99e71
commit f6925dbdd8
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -492,11 +492,8 @@ self: super: builtins.intersectAttrs super {
liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
# Haskell OpenCV bindings need contrib code enabled in the C++ library.
opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; };
# Without this override, the builds lacks pkg-config. # Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3;
# Break cyclic reference that results in an infinite recursion. # Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup; partial-semigroup = dontCheck super.partial-semigroup;

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

@ -12,12 +12,12 @@
, enableJPEG2K ? true, jasper , enableJPEG2K ? true, jasper
, enableEigen ? true, eigen , enableEigen ? true, eigen
, enableOpenblas ? true, openblas , enableOpenblas ? true, openblas
, enableContrib ? true
, enableCuda ? (config.cudaSupport or false), cudatoolkit , enableCuda ? (config.cudaSupport or false), cudatoolkit
, enableUnfree ? false , enableUnfree ? false
, enableIpp ? false , enableIpp ? false
, enableContrib ? false
, enablePython ? false, pythonPackages , enablePython ? false, pythonPackages
, enableGtk2 ? false, gtk2 , enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3 , enableGtk3 ? false, gtk3

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

@ -18577,7 +18577,6 @@ with pkgs;
digikam = libsForQt5.callPackage ../applications/graphics/digikam { digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) kcalcore; inherit (kdeApplications) kcalcore;
opencv3 = opencv3.override { enableContrib = true; };
}; };
displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};