pkgs/by-name/gr/grimoire/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   nodejs_22,
   pnpm,
   python3,
@@ -70,7 +69,12 @@ in
 
     inherit pnpmDeps;
 
-    env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
+    env = {
+      GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
+      # electron-builder must not try to fetch an Electron binary over the
+      # network; we hand it the Nix one via --config.electronDist below.
+      ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    };
 
     postPatch = ''
       cp -r ${grimoire-social-src} ../grimoire-social
@@ -87,6 +91,9 @@ in
       mkdir -p ../grimoire-social/node_modules
       ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
 
+      # Rebuild the better-sqlite3 native addon against the Electron ABI. We do
+      # this ourselves (and disable electron-builder's own rebuild below) so no
+      # network fetch of Electron headers is needed inside the sandbox.
       (
         cd node_modules/better-sqlite3
         HOME="$TMPDIR" node \
@@ -95,7 +102,19 @@ in
           --nodedir="${electron_40.headers}"
       )
 
+      # Package the app the same way upstream CI does (release.yml):
+      # `electron-vite build && electron-builder`. We stop at the unpacked
+      # `--dir` output instead of building AppImage/deb installers, then wrap
+      # the Nix Electron around the produced app.asar. Building through
+      # electron-builder (rather than launching Electron on the raw dist/)
+      # makes `app.isPackaged` true, which is what disables the dev-only
+      # DevTools auto-open and the dev vpkmerge lookup path.
+      export HOME="$TMPDIR"
       pnpm exec electron-vite build
+      pnpm exec electron-builder --linux dir \
+        --config.npmRebuild=false \
+        --config.electronDist=${electron_40.dist} \
+        --config.electronVersion=${electron_40.version}
 
       runHook postBuild
     '';
@@ -104,26 +123,17 @@ in
       runHook preInstall
 
       mkdir -p $out/lib/grimoire
-      cp -r dist $out/lib/grimoire/dist
+      # electron-builder emits the packaged app (app.asar, app.asar.unpacked,
-
+      # and extraResources such as vpkmerge) under release/linux-unpacked/resources.
-      mkdir -p $out/lib/grimoire/resources
+      cp -r release/linux-unpacked/resources $out/lib/grimoire/resources
-      cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
-      echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
-      > $out/lib/grimoire/package.json
-
-      cp -r node_modules $out/lib/grimoire/node_modules
-
-      rm -rf "$out/lib/grimoire/node_modules/@grimoire"
-
-      find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
-      [ -e "$link" ] || rm -f "$link"
-      done
 
+      # Launch the Nix Electron against the packaged asar. process.resourcesPath
+      # resolves to the directory holding app.asar, so the bundled vpkmerge at
+      # resources/vpkmerge/ is found at runtime.
       mkdir -p $out/bin
       makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
-      --add-flags "$out/lib/grimoire" \
+        --add-flags "$out/lib/grimoire/resources/app.asar" \
-      --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
+        --set NODE_ENV production
-      --set NODE_ENV production
 
       runHook postInstall
     '';