diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 22:07:46 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 22:24:10 +0300 |
| commit | f6925dbdd831d5147637f84ecae11b9234b3740c (patch) | |
| tree | 219a3309ded4d2f7ca8caae4bd7cfa3729b72a38 /pkgs/development | |
| parent | 9c14e99e7130ba47b347d16dc346d4587021c13b (diff) | |
| download | nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar.gz nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar.bz2 nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar.lz nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar.xz nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.tar.zst nixpkgs-f6925dbdd831d5147637f84ecae11b9234b3740c.zip | |
opencv3: enable contrib by default
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edec2724d84..d55c230dcc8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -492,11 +492,8 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; 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. - 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. partial-semigroup = dontCheck super.partial-semigroup; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 51be387d75c..ff3ac3b0363 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -12,12 +12,12 @@ , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas +, enableContrib ? true , enableCuda ? (config.cudaSupport or false), cudatoolkit , enableUnfree ? false , enableIpp ? false -, enableContrib ? false , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 |