fix(grimoire): electron 41 with sqlite3 patch
check / build (pull_request) Failing after 14m3s

This commit is contained in:
2026-07-20 14:28:22 +01:00
parent d5c2b45a90
commit eef6db3224
2 changed files with 139 additions and 89 deletions
+92 -89
View File
@@ -9,14 +9,15 @@
gnumake, gnumake,
pkg-config, pkg-config,
makeWrapper, makeWrapper,
electron_40, electron_41,
vpkmerge, vpkmerge,
sqlite, sqlite,
callPackage, callPackage,
makeDesktopItem, makeDesktopItem,
copyDesktopItems, copyDesktopItems,
}: let }:
sources = callPackage ../../../../_sources/generated.nix {}; let
sources = callPackage ../../../../_sources/generated.nix { };
src = sources.grimoire.src; src = sources.grimoire.src;
version = src.rev; version = src.rev;
@@ -32,114 +33,116 @@
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 3; fetcherVersion = 4;
hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268="; hash = "sha256-Mqvvemc3oDCiuY/UnDOc73P+dLqMEFnwQotodVhrPao=";
# hash = lib.fakeHash;
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "grimoire"; name = "grimoire";
exec = "grimoire %u"; exec = "grimoire %u";
desktopName = "Grimoire"; desktopName = "Grimoire";
categories = ["Utility"]; categories = [ "Utility" ];
mimeTypes = ["x-scheme-handler/grimoire"]; mimeTypes = [ "x-scheme-handler/grimoire" ];
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
nativeBuildInputs = [ nativeBuildInputs = [
nodejs_22 nodejs_22
pnpm pnpm
pnpm.configHook pnpm.configHook
python3 python3
gcc gcc
gnumake gnumake
pkg-config pkg-config
makeWrapper makeWrapper
electron_40 electron_41
copyDesktopItems copyDesktopItems
]; ];
desktopItems = [desktopItem]; desktopItems = [ desktopItem ];
buildInputs = [ buildInputs = [
sqlite sqlite
]; ];
inherit pnpmDeps; inherit pnpmDeps;
env = { env = {
GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev"; GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
# electron-builder must not try to fetch an Electron binary over the # electron-builder must not try to fetch an Electron binary over the
# network; we hand it the Nix one via --config.electronDist below. # network; we hand it the Nix one via --config.electronDist below.
ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
}; };
postPatch = '' postPatch = ''
cp -r ${grimoire-social-src} ../grimoire-social cp -r ${grimoire-social-src} ../grimoire-social
chmod -R u+w ../grimoire-social chmod -R u+w ../grimoire-social
mkdir -p resources/vpkmerge mkdir -p resources/vpkmerge
cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64 cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
chmod +x resources/vpkmerge/vpkmerge-linux-x86_64 chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
mkdir -p ../grimoire-social/node_modules mkdir -p ../grimoire-social/node_modules
ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
# Rebuild the better-sqlite3 native addon against the Electron ABI. We do # Rebuild the better-sqlite3 native addon against the Electron ABI. We do
# this ourselves (and disable electron-builder's own rebuild below) so no # this ourselves (and disable electron-builder's own rebuild below) so no
# network fetch of Electron headers is needed inside the sandbox. # network fetch of Electron headers is needed inside the sandbox.
( (
cd node_modules/better-sqlite3 cd node_modules/better-sqlite3
HOME="$TMPDIR" node \ patch -p1 < ${./patches/better-sqlite3-thistogetthis.patch}
"${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \ HOME="$TMPDIR" node \
rebuild \ "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
--nodedir="${electron_40.headers}" rebuild \
) --nodedir="${electron_41.headers}"
)
# Package the app the same way upstream CI does (release.yml): # Package the app the same way upstream CI does (release.yml):
# `electron-vite build && electron-builder`. We stop at the unpacked # `electron-vite build && electron-builder`. We stop at the unpacked
# `--dir` output instead of building AppImage/deb installers, then wrap # `--dir` output instead of building AppImage/deb installers, then wrap
# the Nix Electron around the produced app.asar. Building through # the Nix Electron around the produced app.asar. Building through
# electron-builder (rather than launching Electron on the raw dist/) # electron-builder (rather than launching Electron on the raw dist/)
# makes `app.isPackaged` true, which is what disables the dev-only # makes `app.isPackaged` true, which is what disables the dev-only
# DevTools auto-open and the dev vpkmerge lookup path. # DevTools auto-open and the dev vpkmerge lookup path.
export HOME="$TMPDIR" export HOME="$TMPDIR"
pnpm exec electron-vite build pnpm exec electron-vite build
pnpm exec electron-builder --linux dir \ pnpm exec electron-builder --linux dir \
--config.npmRebuild=false \ --config.npmRebuild=false \
--config.electronDist=${electron_40.dist} \ --config.electronDist=${electron_41.dist} \
--config.electronVersion=${electron_40.version} --config.electronVersion=${electron_41.version}
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/lib/grimoire mkdir -p $out/lib/grimoire
# electron-builder emits the packaged app (app.asar, app.asar.unpacked, # electron-builder emits the packaged app (app.asar, app.asar.unpacked,
# and extraResources such as vpkmerge) under release/linux-unpacked/resources. # and extraResources such as vpkmerge) under release/linux-unpacked/resources.
cp -r release/linux-unpacked/resources $out/lib/grimoire/resources cp -r release/linux-unpacked/resources $out/lib/grimoire/resources
# Launch the Nix Electron against the packaged asar. process.resourcesPath # Launch the Nix Electron against the packaged asar. process.resourcesPath
# resolves to the directory holding app.asar, so the bundled vpkmerge at # resolves to the directory holding app.asar, so the bundled vpkmerge at
# resources/vpkmerge/ is found at runtime. # resources/vpkmerge/ is found at runtime.
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \ makeWrapper ${electron_41}/bin/electron $out/bin/grimoire \
--add-flags "$out/lib/grimoire/resources/app.asar" \ --add-flags "$out/lib/grimoire/resources/app.asar" \
--set NODE_ENV production --set NODE_ENV production
runHook postInstall runHook postInstall
''; '';
meta = { meta = {
description = "Grimoire Electron-based mod manager"; description = "Grimoire Electron-based mod manager";
platforms = ["x86_64-linux"]; platforms = [ "x86_64-linux" ];
}; };
} }
@@ -0,0 +1,47 @@
--- a/src/util/macros.cpp 2026-07-20 13:25:03.226579751 +0100
+++ b/src/util/macros.cpp 2026-07-20 13:25:43.980692531 +0100
@@ -11,6 +11,19 @@
#define GET_PROTOTYPE(obj) ((obj)->GetPrototype())
#endif
+// PropertyCallbackInfo::This() and Holder() were removed; use HolderV2().
+// Tracking bug for V8 API removals: http://crbug.com/333672197
+// V8 head has since restored Holder() and deprecated HolderV2():
+// https://chromium.googlesource.com/v8/v8/+/main/include/v8-function-callback.h
+// V8_INLINE Local<Object> Holder() const;
+// V8_DEPRECATE_SOON("Use Holder().")
+// V8_INLINE Local<Object> HolderV2() const;
+#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
+#define PROPERTY_HOLDER(info) (info).HolderV2()
+#else
+#define PROPERTY_HOLDER(info) (info).This()
+#endif
+
#define EasyIsolate v8::Isolate* isolate = v8::Isolate::GetCurrent()
#define OnlyIsolate info.GetIsolate()
#define OnlyContext isolate->GetCurrentContext()
--- a/src/objects/database.cpp 2026-07-20 13:25:03.229579774 +0100
+++ b/src/objects/database.cpp 2026-07-20 13:25:52.605028002 +0100
@@ -408,10 +408,10 @@
}
NODE_GETTER(Database::JS_open) {
- info.GetReturnValue().Set(Unwrap<Database>(info.This())->open);
+ info.GetReturnValue().Set(Unwrap<Database>(PROPERTY_HOLDER(info))->open);
}
NODE_GETTER(Database::JS_inTransaction) {
- Database* db = Unwrap<Database>(info.This());
+ Database* db = Unwrap<Database>(PROPERTY_HOLDER(info));
info.GetReturnValue().Set(db->open && !static_cast<bool>(sqlite3_get_autocommit(db->db_handle)));
}
--- a/src/objects/statement.cpp 2026-07-20 13:25:03.231579789 +0100
+++ b/src/objects/statement.cpp 2026-07-20 13:25:52.606984847 +0100
@@ -378,6 +378,6 @@
}
NODE_GETTER(Statement::JS_busy) {
- Statement* stmt = Unwrap<Statement>(info.This());
+ Statement* stmt = Unwrap<Statement>(PROPERTY_HOLDER(info));
info.GetReturnValue().Set(stmt->alive && stmt->locked);
}