From aedcfbf4e721845c1af212f9d80df3996be648e6 Mon Sep 17 00:00:00 2001
From: asepharyana <superaseph@gmail.com>
Date: Fri, 21 Aug 2026 17:03:28 +0700
Subject: [PATCH] fix: nix build with dontFixup for .bun symlink issues, use
 root node_modules + Attic cache push

---
 .github/workflows/ci.yml | 15 +++++++++------
 flake.nix                | 22 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c93070e..b35af7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,8 +167,10 @@ jobs:
           PROFILE="mcpedia-${SERVICE}"
           # Substitute from Attic cache (fast — downloads over HTTPS)
           # Falls back to SSH copy if substitution fails
-          ssh "$VPS_USER@$VPS_HOST" \
-            "curl -s -o /dev/null -w '%{http_code}' https://attic.asepharyana.my.id/mcpedia/$(echo '$STORE_PATH' | cut -d'-' -f2).narinfo 2>/dev/null; sudo /nix/var/nix/profiles/default/bin/nix-store --realise '$STORE_PATH'"
+          REALISE_RESULT=$(ssh "$VPS_USER@$VPS_HOST" \
+            "sudo /nix/var/nix/profiles/default/bin/nix-store --realise '$STORE_PATH' 2>&1 || true")
+          echo "$REALISE_RESULT"
+
           # Update profile + restart
           ssh "$VPS_USER@$VPS_HOST" \
             "sudo /nix/var/nix/profiles/default/bin/nix-env \
@@ -236,11 +238,12 @@ jobs:
       - name: Build web Nix derivation
         id: build
         run: |
+          REPO_ROOT="$(pwd)"
           nix-build -E \
-            "let pkgs = import <nixpkgs> {}; in pkgs.callPackage ./web.nix {
-              webNextDir = ./apps/web/.next;
-              webPkgDir = ./apps/web;
-              nodeModulesPath = .;
+            "let pkgs = import <nixpkgs> {}; in pkgs.callPackage ${REPO_ROOT}/web.nix {
+              webNextDir = ${REPO_ROOT}/apps/web/.next;
+              webPkgDir = ${REPO_ROOT}/apps/web;
+              nodeModulesPath = ${REPO_ROOT};
             }" \
             --impure --option sandbox false
           STORE_PATH=$(readlink result)
diff --git a/flake.nix b/flake.nix
index 28fe5e0..2ee29ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,10 +10,15 @@
     flake-utils.lib.eachDefaultSystem (system:
       let pkgs = import nixpkgs { inherit system; }; in {
         packages = {
+          # ─── API: Hono ────────────────────────────────────────────────
+          # bun build bundles TS → JS. @mcpedia/* kept external (resolved from
+          # root node_modules at runtime). We copy the ROOT node_modules (the
+          # full workspace install) so all transitive deps are available.
           api = pkgs.stdenvNoCC.mkDerivation {
             pname = "mcpedia-api";
             version = "1.0.0";
             src = ./.;
+            dontFixup = true;
             nativeBuildInputs = [ pkgs.bun pkgs.makeBinaryWrapper ];
             buildPhase = ''
               export HOME=$TMPDIR
@@ -29,7 +34,8 @@
             installPhase = ''
               mkdir -p $out/share/mcpedia-api
               cp -r apps/api/dist $out/share/mcpedia-api/dist
-              cp -rL apps/api/node_modules $out/share/mcpedia-api/node_modules
+              mkdir -p $out/share/mcpedia-api/node_modules
+              cp -r node_modules/* $out/share/mcpedia-api/node_modules/ 2>/dev/null || true
               cp apps/api/package.json $out/share/mcpedia-api/
               makeBinaryWrapper ${pkgs.bun}/bin/bun $out/bin/mcpedia-api \
                 --add-flags "run dist/index.js" \
@@ -37,10 +43,12 @@
             '';
           };
 
+          # ─── MCP: Streamable HTTP ──────────────────────────────────────
           mcp = pkgs.stdenvNoCC.mkDerivation {
             pname = "mcpedia-mcp";
             version = "1.0.0";
             src = ./.;
+            dontFixup = true;
             nativeBuildInputs = [ pkgs.bun pkgs.makeBinaryWrapper ];
             buildPhase = ''
               export HOME=$TMPDIR
@@ -56,7 +64,8 @@
             installPhase = ''
               mkdir -p $out/share/mcpedia-mcp
               cp -r apps/mcp/dist $out/share/mcpedia-mcp/dist
-              cp -rL apps/mcp/node_modules $out/share/mcpedia-mcp/node_modules
+              mkdir -p $out/share/mcpedia-mcp/node_modules
+              cp -r node_modules/* $out/share/mcpedia-mcp/node_modules/ 2>/dev/null || true
               cp apps/mcp/package.json $out/share/mcpedia-mcp/
               makeBinaryWrapper ${pkgs.bun}/bin/bun $out/bin/mcpedia-mcp \
                 --add-flags "run dist/http.js" \
@@ -64,10 +73,14 @@
             '';
           };
 
+          # ─── Worker: BullMQ ────────────────────────────────────────────
           worker = pkgs.stdenvNoCC.mkDerivation {
             pname = "mcpedia-worker";
             version = "1.0.0";
             src = ./.;
+            # The .bun cache in node_modules uses symlinks that may be
+            # broken in the Nix store. Skip the fixup phase's symlink check.
+            dontFixup = true;
             nativeBuildInputs = [ pkgs.bun pkgs.makeBinaryWrapper ];
             buildPhase = ''
               export HOME=$TMPDIR
@@ -83,7 +96,8 @@
             installPhase = ''
               mkdir -p $out/share/mcpedia-worker
               cp -r apps/worker/dist $out/share/mcpedia-worker/dist
-              cp -rL apps/worker/node_modules $out/share/mcpedia-worker/node_modules
+              mkdir -p $out/share/mcpedia-worker/node_modules
+              cp -r node_modules/* $out/share/mcpedia-worker/node_modules/ 2>/dev/null || true
               cp apps/worker/package.json $out/share/mcpedia-worker/
               makeBinaryWrapper ${pkgs.bun}/bin/bun $out/bin/mcpedia-worker \
                 --add-flags "run dist/index.js" \
@@ -92,4 +106,4 @@
           };
         };
       });
-}
+}
\ No newline at end of file