From a96e711a0c9258d4e5e68d6f43433adabd45e1a7 Mon Sep 17 00:00:00 2001 From: Adrian G L Date: Tue, 19 May 2026 17:32:20 +0200 Subject: [PATCH] fix llama ui --- packages/llama-cpp-nightly/default.nix | 8 +++++--- packages/llama-cpp-nightly/ui.nix | 9 ++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/llama-cpp-nightly/default.nix b/packages/llama-cpp-nightly/default.nix index 825557c..c78dd27 100644 --- a/packages/llama-cpp-nightly/default.nix +++ b/packages/llama-cpp-nightly/default.nix @@ -116,11 +116,13 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals syclSupport ([ mkl ] ++ optionals (oneDNN != null) [ oneDNN ]) ++ [ curl ]; + postPatch = optionalString (uiAssets != null) '' + mkdir -p build/tools/ui/dist + cp -v ${uiAssets}/{index.html,bundle.js,bundle.css,loading.html} build/tools/ui/dist/ + ''; + preConfigure = '' prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)" - '' + optionalString (uiAssets != null) '' - mkdir -p $sourceRoot/build/tools/ui/dist - cp ${uiAssets}/* $sourceRoot/build/tools/ui/dist/ ''; cmakeFlags = [ diff --git a/packages/llama-cpp-nightly/ui.nix b/packages/llama-cpp-nightly/ui.nix index 1dedbc7..6b8f6e1 100644 --- a/packages/llama-cpp-nightly/ui.nix +++ b/packages/llama-cpp-nightly/ui.nix @@ -19,10 +19,17 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-Po5SWJv3vmcBR7y62G9/CfvI3Lk/MYdjFMTTy2dsgoY="; + postPatch = '' + substituteInPlace svelte.config.js \ + --replace-fail "../../build/tools/ui/dist" "./dist" + substituteInPlace scripts/vite-plugin-llama-cpp-build.ts \ + --replace-fail "../../build/tools/ui/dist" "./dist" + ''; + installPhase = '' runHook preInstall mkdir $out - cp ../../build/tools/ui/dist/* $out/ + cp dist/* $out/ runHook postInstall '';