diff options
author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-03-31 16:08:14 +0300 |
---|---|---|
committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-07-20 17:27:07 +0300 |
commit | bf9e6fe9b852ea9185b9d495dc974491d4fbf355 (patch) | |
tree | 7e75091a4b821215d6f20f4c2e3e42fa1f1ddfb4 /pkgs/applications | |
parent | 74549ec63bb6b125590bbb0fa2db24106c257a11 (diff) | |
download | nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar.gz nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar.bz2 nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar.lz nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar.xz nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.tar.zst nixlib-bf9e6fe9b852ea9185b9d495dc974491d4fbf355.zip |
tree-wide: rm `cudaSupport ? false` formal parameters
'cudaSupport ? false' -> 'cudaSupport ? config.cudaSupport or false' to respect global defaults Packages expressions that take `cudaSupport ? false` are likely to ignore `config.cudaSupport`. Instead, we want them to make `cudaSupport` a required argument, or to explicitly refer to `config`
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/math/cntk/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index f885dae444ba..248504501613 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -2,7 +2,8 @@ , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false -, cudaSupport ? false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11 +, config +, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport }: diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index e3ce66356ba6..b32aa86f9f2f 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, - cudaSupport ? false, cudaPackages }: + config, + cudaSupport ? config.cudaSupport or false, cudaPackages }: assert cudaSupport -> cudaPackages != { }; |