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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-31 18:04:31 +02:00
parent 4b515cf6ef cbbe9f0f21
commit 96e5474329
33 changed files with 545 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/opencv/3.x.nix
+2 -1
View File
@@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
, enableCuda ? config.cudaSupport or false, cudatoolkit
, enableCuda ? (config.cudaSupport or false) &&
stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false
pkgs/development/libraries/opencv/4.x.nix
+2 -1
View File
@@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
, enableCuda ? config.cudaSupport or false, cudatoolkit
, enableCuda ? (config.cudaSupport or false) &&
stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false