diff options
| author | Matthew Daiter <matthew@nomoko.camera> | 2016-11-23 18:22:24 +0100 |
|---|---|---|
| committer | Matthew Daiter <matthew@nomoko.camera> | 2016-11-23 18:33:51 +0100 |
| commit | f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2 (patch) | |
| tree | e6fae014de1b66ff4b1fcee012454f46d68188c0 /pkgs/development/libraries/opencv | |
| parent | 5d7f2a40a89d9f43bcbc8eca1f2d5808b93e0ddb (diff) | |
| download | nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar.gz nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar.bz2 nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar.lz nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar.xz nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.tar.zst nixpkgs-f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2.zip | |
opencv3: added CUDA 8.0 specific patches
opencv3: added informative comments
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 aa2a1660d6f..5d6221ad877 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; |