diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-25 12:01:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 12:01:13 +0000 |
| commit | 4f78094c5059eab9849fd67a5d153a0f5f266b8c (patch) | |
| tree | 8fdd0a1f000f1fbd734cc5240692615976fa8ef6 /pkgs/by-name/ll/llama-cpp/package.nix | |
| parent | cc6a59f1dedd14296eb6eff2297843f29768bb77 (diff) | |
| parent | 35551ddea86f0a0a2bd7f05b771613f17b15bbcc (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name/ll/llama-cpp/package.nix')
| -rw-r--r-- | pkgs/by-name/ll/llama-cpp/package.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 2e5514dd15f29..254f8c2a51f6f 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -122,12 +122,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ - ( - with cudaPackages.flags; - cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - builtins.concatStringsSep ";" (map dropDot cudaCapabilities) - ) - ) + (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] ++ optionals rocmSupport [ (cmakeFeature "CMAKE_C_COMPILER" "hipcc") |