From 05967f9a2c5b8b7298a31b324064e4fe0f63be9b Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 19 Nov 2023 06:04:29 +0000 Subject: llama-cpp: fix build due to openblas update add patch so build checks for openblas64 module https://github.com/NixOS/nixpkgs/pull/255443 updated from openblas 0.3.21 -> 0.3.24. openblas 0.3.22 moved openblas.pc -> openblas64.pc https://github.com/OpenMathLib/OpenBLAS/issues/3790 --- pkgs/by-name/ll/llama-cpp/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 400e8f0250c06..408f83642ba59 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,6 +2,7 @@ , cmake , darwin , fetchFromGitHub +, fetchpatch , nix-update-script , stdenv , symlinkJoin @@ -46,6 +47,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; }; + patches = [ + # openblas > v0.3.21 64-bit pkg-config file is now named openblas64.pc + # can remove when patch is accepted upstream + # https://github.com/ggerganov/llama.cpp/pull/4134 + (fetchpatch { + name = "openblas64-pkg-config.patch"; + url = "https://github.com/ggerganov/llama.cpp/commit/c885cc9f76c00557601b877136191b0f7aadc320.patch"; + hash = "sha256-GBTxCiNrCazYRvcHwbqVMAALuJ+Svzf5BE7+nkxw064="; + }) + ]; + postPatch = '' substituteInPlace ./ggml-metal.m \ --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" -- cgit 1.4.1