diff options
| author | Matthew Daiter <matthew@nomoko.camera> | 2016-12-13 11:26:56 +0100 |
|---|---|---|
| committer | Matthew Daiter <matthew@nomoko.camera> | 2016-12-13 11:26:56 +0100 |
| commit | d6f1081314e0ea341bd237e9064e94a1b5ce874a (patch) | |
| tree | 7d8ecafeebd9ff1cd4af47db5851a5f394fd0664 /pkgs/development/libraries/opencv | |
| parent | 50466c2d4feca9eee52815eebb30ab6c62dc4deb (diff) | |
| download | nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar.gz nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar.bz2 nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar.lz nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar.xz nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.tar.zst nixpkgs-d6f1081314e0ea341bd237e9064e94a1b5ce874a.zip | |
opencv3: pull patches only if necessary
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d86a2671cde..388167319c1 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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"; |