From d39b308eaf0ac91c2e1f432bf66751193a470a56 Mon Sep 17 00:00:00 2001 From: hutli Date: Wed, 27 Mar 2024 19:14:28 +0100 Subject: [PATCH] nix: moved blas availability check to package inputs so it is still overridable --- .devops/nix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 77d7e4f5e..d0db0f10e 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 =