From: hutli <redacted>
Date: Wed, 27 Mar 2024 18:14:28 +0000 (+0100)
Subject: nix: moved blas availability check to package inputs so it is still overridable
X-Git-Tag: upstream/0.0.4488~1926
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=d39b308eaf0ac91c2e1f432bf66751193a470a56;p=pkg%2Fggml%2Fsources%2Fllama.cpp

nix: moved blas availability check to package inputs so it is still overridable
---

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 =