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

opencv: have a better fix for the python bindings issue

Browse Source
This commit is contained in:
Bas van Dijk 2018-01-02 10:00:43 +01:00 committed by Orivej Desh
parent 6919867b3b
commit 9aad587cbb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchurl, fetchFromGitHub , fetchurl, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, unzip, zlib, pcre, hdf5 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
, caffe, glog, boost, google-gflags, protobuf , caffe, glog, boost, google-gflags, protobuf
, config , config
@ -151,6 +151,14 @@ stdenv.mkDerivation rec {
name = "opencv-${version}"; name = "opencv-${version}";
inherit version src; inherit version src;
patches = [
# Fix for: https://github.com/opencv/opencv/issues/10474
(fetchpatch {
url = "https://github.com/opencv/opencv/commit/ea5a3e557f93844fdb5e54e3e8acfc5f61c6fd9f.patch";
sha256 = "1w7jmqlrx73ydh9jjsnnic5xz8r04kxbjpzkcfyb91v3az9132r1";
})
];
postUnpack = lib.optionalString buildContrib '' postUnpack = lib.optionalString buildContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
''; '';
@ -242,11 +250,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
# Workaround for: https://github.com/opencv/opencv/issues/10474
preBuild = ''
make opencv_dnn
'';
postBuild = lib.optionalString enableDocs '' postBuild = lib.optionalString enableDocs ''
make doxygen make doxygen
''; '';