fix: bumped electron on grimoire
check / build (pull_request) Failing after 15s

This commit is contained in:
2026-05-30 12:40:33 +01:00
parent cccc55ef78
commit 8d618dff18
+5 -5
View File
@@ -10,7 +10,7 @@
gnumake, gnumake,
pkg-config, pkg-config,
makeWrapper, makeWrapper,
electron_39, electron_40,
vpkmerge, vpkmerge,
sqlite, sqlite,
callPackage, callPackage,
@@ -32,7 +32,7 @@
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 2; fetcherVersion = 2;
hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s="; hash = "sha256-CrVc0gO0CtesGHbGxnrFeDR3NahyaxGSI3lMHtbGfcM=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -48,7 +48,7 @@ in
gnumake gnumake
pkg-config pkg-config
makeWrapper makeWrapper
electron_39 electron_40
]; ];
buildInputs = [ buildInputs = [
@@ -79,7 +79,7 @@ in
HOME="$TMPDIR" node \ HOME="$TMPDIR" node \
"${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \ "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
rebuild \ rebuild \
--nodedir="${electron_39.headers}" --nodedir="${electron_40.headers}"
) )
pnpm exec electron-vite build pnpm exec electron-vite build
@@ -107,7 +107,7 @@ in
done done
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${electron_39}/bin/electron $out/bin/grimoire \ makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
--add-flags "$out/lib/grimoire" \ --add-flags "$out/lib/grimoire" \
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \ --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
--set NODE_ENV production --set NODE_ENV production