Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda

all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
parent 5fc8559fbb 69048c4357
commit 446520bb9b
13 changed files with 45 additions and 69 deletions
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand
+{ config, stdenv, lib, runCommand
 , fetchFromGitHub
 , fetchurl
 , cmake
@@ -13,8 +13,8 @@
 , Accelerate, CoreGraphics, CoreVideo
 , lmdbSupport ? true, lmdb
 , leveldbSupport ? true, leveldb, snappy
-, cudaSupport ? stdenv.isLinux, cudatoolkit
-, cudnnSupport ? false, cudnn ? null
+, cudaSupport ? config.cudaSupport or false, cudatoolkit
+, cudnnSupport ? cudaSupport, cudnn ? null
 , ncclSupport ? false, nccl ? null
 , pythonSupport ? false, python ? null, numpy ? null
 , substituteAll