diff options
| author | viric <viric@viric.name> | 2016-11-28 14:06:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 14:06:33 +0100 |
| commit | 75d9dc85161e87777188a14da7443a7e4a62c952 (patch) | |
| tree | 5532652e0e44a49415163984a05c9a24688a1daf /pkgs/development/libraries/opencv | |
| parent | c93ec7b6b75ce6c7aebe11a18f25f1831d0620a6 (diff) | |
| parent | f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2 (diff) | |
| download | nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar.gz nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar.bz2 nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar.lz nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar.xz nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.tar.zst nixlib-75d9dc85161e87777188a14da7443a7e4a62c952.zip | |
Merge pull request #20631 from mdaiter/opencv_upgrade
opencv3: added CUDA 8.0 specific patches
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0c69e21c8dc4..2ad15ca8c152 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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; |