nikkuss/pkgs
2
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: grimorie bump to electron 40 #15

Closed
doloro wants to merge 14 commits from doloro/pkgs-nikkuss:grimorie into main
pull from: doloro/pkgs-nikkuss:grimorie
merge into: nikkuss:main
Conversation 1 Commits 14 Files Changed 9
+5 -5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d618dff18 - Show all commits
pkgs/by-name/gr/grimorie/package.nix
+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