diff options
| author | hutli <hutli@hutli.hu> | 2024-03-27 19:14:28 +0100 |
|---|---|---|
| committer | Someone <newkozlukov@gmail.com> | 2024-03-28 07:48:27 +0000 |
| commit | d39b308eaf0ac91c2e1f432bf66751193a470a56 (patch) | |
| tree | 842902badb22a5323f4d1d3f60f0243ec12c1ac3 | |
| parent | c87397664964e5a2a21de1877d504b23a2a35332 (diff) | |
nix: moved blas availability check to package inputs so it is still overridable
| -rw-r--r-- | .devops/nix/package.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 77d7e4f5..d0db0f10 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -18,13 +18,13 @@ vulkan-headers, vulkan-loader, clblast, - useBlas ? builtins.all (x: !x) [ + useBlas ? builtins.all (x: !x) [ useCuda useMetalKit useOpenCL useRocm useVulkan - ], + ] && blas.meta.available, useCuda ? config.cudaSupport, useMetalKit ? stdenv.isAarch64 && stdenv.isDarwin && !useOpenCL, useMpi ? false, # Increases the runtime closure size by ~700M @@ -200,7 +200,7 @@ effectiveStdenv.mkDerivation ( ++ optionals useMpi [ mpi ] ++ optionals useOpenCL [ clblast ] ++ optionals useRocm rocmBuildInputs - ++ optionals (useBlas && blas.meta.available) [ blas ] + ++ optionals useBlas [ blas ] ++ optionals useVulkan vulkanBuildInputs; cmakeFlags = |