From 2b3763c395207f46aaf0910033d5a64e480ece5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Jun 2026 21:39:08 +0200 Subject: [PATCH 1/2] codebase-memory-mcp: build parallel again I disabled that when migrating to makeFlags by accident --- pkgs/by-name/co/codebase-memory-mcp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix index 2dce136ff75c..5ccfeb9d1b8a 100644 --- a/pkgs/by-name/co/codebase-memory-mcp/package.nix +++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; __structuredAttrs = true; + enableParallelBuilding = true; + makefile = "Makefile.cbm"; # scripts/build.sh verifies CC via `file`, which fails on Nix's compiler wrapper. From 1a0fe662869eb17d3438430b468b3d20dca6d200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Jun 2026 21:39:37 +0200 Subject: [PATCH 2/2] codebase-memory-mcp: build web ui We do not need gnumake in nativeBuildInputs as it is included in stdenv. --- .../co/codebase-memory-mcp/package.nix | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix index 5ccfeb9d1b8a..e27c09b5cd86 100644 --- a/pkgs/by-name/co/codebase-memory-mcp/package.nix +++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix @@ -1,8 +1,11 @@ { lib, - stdenv, + bash, fetchFromGitHub, - gnumake, + fetchNpmDeps, + nodejs, + npmHooks, + stdenv, zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -20,9 +23,31 @@ stdenv.mkDerivation (finalAttrs: { ./remove-install-update.diff ]; - nativeBuildInputs = [ gnumake ]; + postPatch = '' + substituteInPlace Makefile.cbm \ + --replace-fail "npm ci &&" "" - buildInputs = [ zlib ]; + substituteInPlace scripts/embed-frontend.sh \ + --replace-fail "/bin/bash" "${bash}/bin/bash" + ''; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; + hash = "sha256-feoZNsZfrPgoLdjlnnh3w3vTxR6AwPdUkPubaR93TAk="; + }; + + npmRoot = "graph-ui"; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + buildInputs = [ + bash + zlib + ]; strictDeps = true; __structuredAttrs = true; @@ -34,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { # scripts/build.sh verifies CC via `file`, which fails on Nix's compiler wrapper. # Call make directly — mirrors upstream flake.nix. makeFlags = [ - "cbm" + "cbm-with-ui" "CFLAGS_EXTRA='-DCBM_VERSION=\"${finalAttrs.version}\"'" ];