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

bump: electron 40 (#16)
cache / build (push) Successful in 36s
Details

Browse Source 
Reviewed-on: #16
Co-authored-by: Doloro1978 <doloroo@proton.me>
Co-committed-by: Doloro1978 <doloroo@proton.me>
This commit was merged in pull request #16.
This commit is contained in:
Doloro1978
2026-05-30 16:21:08 +04:00
committed by nikkuss
parent 563375e7a0
commit af49f7b7c7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/gr/grimorie/package.nix
+7 -7
View File
@@ -10,15 +10,15 @@
gnumake, gnumake,
pkg-config, pkg-config,
makeWrapper, makeWrapper,
electron_39, electron_40,
vpkmerge, vpkmerge,
sqlite, sqlite,
callPackage, callPackage,
}: let }: let
version = "1.13.1";
sources = callPackage ../../../../_sources/generated.nix {}; sources = callPackage ../../../../_sources/generated.nix {};
src = sources.grimoire.src; src = sources.grimoire.src;
version = src.rev;
# This would go into nvfetcher but it isnt versioned.. # This would go into nvfetcher but it isnt versioned..
grimoire-social-src = fetchFromGitHub { grimoire-social-src = fetchFromGitHub {
@@ -31,8 +31,8 @@
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 2; fetcherVersion = 3;
hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s="; hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
}; };
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