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

Merge pull request #20631 from mdaiter/opencv_upgrade

Browse Source 
opencv3: added CUDA 8.0 specific patches
This commit is contained in:
viric 2016-11-28 14:06:33 +01:00 committed by GitHub
commit 75d9dc8516
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, unzip
{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip
, zlib
, enableIpp ? false
, enableContrib ? false
@ -14,7 +14,7 @@
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableEigen ? false, eigen
, enableCuda ? false, cudatoolkit, gcc49
, enableCuda ? false, cudatoolkit, gcc5
}:
let
@ -42,6 +42,17 @@ stdenv.mkDerivation rec {
sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429";
};
patches = [
(fetchpatch { # Patch for CUDA 8 compatibility
url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch";
sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1";
})
(fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0
url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
})
];
preConfigure =
let ippicvVersion = "20151201";
ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
++ lib.optional enableCuda [ cudatoolkit gcc49 ]
++ lib.optional enableCuda [ cudatoolkit gcc5 ]
;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;