ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21116 from mdaiter/cudaOpenCVIf

Browse Source 
opencv3: pull patches only if necessary
This commit is contained in:
viric 2016-12-13 14:34:51 +01:00 committed by GitHub
commit b1c20ad384
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,16 +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";
})
];
patches =
lib.optionals enableCuda [
(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";