colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #304736 from abysssol/ollama-fix

Browse Source 
ollama: fix compilation errors caused by dependency changes
This commit is contained in:
Pol Dellaiera 2024-04-17 10:06:40 +02:00 committed by GitHub
commit 55f906f52b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/ollama/default.nix
View File

@ -100,10 +100,6 @@ let
cudaPackages.cuda_cudart cudaPackages.cuda_cudart
cudaPackages.cuda_cudart.static cudaPackages.cuda_cudart.static
]; ];
postBuild = ''
rm "$out/lib64"
ln -s "lib" "$out/lib64"
'';
}; };
runtimeLibs = lib.optionals enableRocm [ runtimeLibs = lib.optionals enableRocm [
@ -140,6 +136,8 @@ goBuild ((lib.optionalAttrs enableRocm {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
] ++ lib.optionals enableRocm [
rocmPackages.llvm.bintools
] ++ lib.optionals (enableRocm || enableCuda) [ ] ++ lib.optionals (enableRocm || enableCuda) [
makeWrapper makeWrapper
] ++ lib.optionals stdenv.isDarwin ] ++ lib.optionals stdenv.isDarwin