From 863ed24f75c78a1f2d5e086f83fb0e74f9289726 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Sat, 30 May 2026 13:17:38 +0100 Subject: [PATCH 1/2] bump: electron 40 --- pkgs/by-name/gr/grimorie/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix index 8f7ce9f..17da157 100644 --- a/pkgs/by-name/gr/grimorie/package.nix +++ b/pkgs/by-name/gr/grimorie/package.nix @@ -10,15 +10,15 @@ gnumake, pkg-config, makeWrapper, - electron_39, + electron_40, vpkmerge, sqlite, callPackage, }: let - version = "1.13.1"; sources = callPackage ../../../../_sources/generated.nix {}; src = sources.grimoire.src; + version = src.rev; # This would go into nvfetcher but it isnt versioned.. grimoire-social-src = fetchFromGitHub { @@ -31,8 +31,8 @@ pnpmDeps = pnpm.fetchDeps { pname = "grimoire"; inherit version src; - fetcherVersion = 2; - hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s="; + fetcherVersion = 3; + hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4="; }; in stdenv.mkDerivation { @@ -48,7 +48,7 @@ in gnumake pkg-config makeWrapper - electron_39 + electron_40 ]; buildInputs = [ @@ -79,7 +79,7 @@ in HOME="$TMPDIR" node \ "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \ rebuild \ - --nodedir="${electron_39.headers}" + --nodedir="${electron_40.headers}" ) pnpm exec electron-vite build @@ -107,7 +107,7 @@ in done 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" \ --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \ --set NODE_ENV production -- 2.54.0 From d593de75202a5a2d5c5fb4c105e81ccdadb95f06 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 3 Jun 2026 14:58:40 +0100 Subject: [PATCH 2/2] feat(grimoire): desktop file --- pkgs/by-name/gr/grimorie/package.nix | 47 +++++++++++++++++----------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix index 17da157..730edc8 100644 --- a/pkgs/by-name/gr/grimorie/package.nix +++ b/pkgs/by-name/gr/grimorie/package.nix @@ -14,6 +14,7 @@ vpkmerge, sqlite, callPackage, + makeDesktopItem, }: let sources = callPackage ../../../../_sources/generated.nix {}; @@ -34,6 +35,14 @@ fetcherVersion = 3; hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4="; }; + + desktopItem = makeDesktopItem { + name = "grimoire"; + exec = "$out/bin/grimoire %u"; + desktopName = "Grimoire"; + categories = ["Utility"]; + MimeType = "x-scheme-handler/grimoire"; + }; in stdenv.mkDerivation { pname = "grimoire"; @@ -88,31 +97,33 @@ in ''; installPhase = '' - runHook preInstall + runHook preInstall - mkdir -p $out/lib/grimoire - cp -r dist $out/lib/grimoire/dist + mkdir -p $out/lib/grimoire + cp -r dist $out/lib/grimoire/dist - mkdir -p $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 + mkdir -p $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 + cp -r node_modules $out/lib/grimoire/node_modules - rm -rf "$out/lib/grimoire/node_modules/@grimoire" + 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 + find "$out/lib/grimoire/node_modules" -type l | while read -r link; do + [ -e "$link" ] || rm -f "$link" + done - mkdir -p $out/bin - makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \ - --add-flags "$out/lib/grimoire" \ - --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \ - --set NODE_ENV production + mkdir -p $out/bin + makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \ + --add-flags "$out/lib/grimoire" \ + --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \ + --set NODE_ENV production - runHook postInstall + cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop + + runHook postInstall ''; meta = { -- 2.54.0