From 808d9f9ffb64d910e8b847f2db41e466c1603a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 23 Mar 2024 19:21:39 +0100 Subject: [PATCH] local-ai: use cmake to install grpc-server --- pkgs/by-name/lo/local-ai/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 10a2ad778d80..d074dd98ebcc 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -92,19 +92,17 @@ let cd examples cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server cp llava/clip.* llava/llava.* grpc-server - echo "add_subdirectory(grpc-server)" >> CMakeLists.txt + printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt cp ${src}/backend/backend.proto grpc-server sed -i grpc-server/CMakeLists.txt \ - -e '/get_filename_component/ s;[.\/]*backend/;;' + -e '/get_filename_component/ s;[.\/]*backend/;;' \ + -e '$a\install(TARGETS ''${TARGET} RUNTIME)' cd .. ''; cmakeFlags = prev.cmakeFlags ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" false) ]; - installPhase = '' - install -Dt $out/bin bin/grpc-server - ''; buildInputs = prev.buildInputs ++ [ protobuf # provides also abseil_cpp as propagated build input grpc @@ -317,7 +315,7 @@ let -e 's, && git checkout.*,,g' \ -e '/mod download/ d' \ - ${cp} ${llama-cpp-grpc}/bin/grpc-server backend/cpp/llama + ${cp} ${llama-cpp-grpc}/bin/*grpc-server backend/cpp/llama/grpc-server echo "grpc-server:" > backend/cpp/llama/Makefile '' ;