1
0
forked from nikkuss/pkgs

14 Commits

Author SHA1 Message Date
doloro be39398615 fix: hash 2026-05-30 12:54:18 +01:00
doloro c8274e668e lint: removed some comments 2026-05-30 12:48:07 +01:00
doloro 4a59b86a47 fix: vpkmerge and grimorie are using nvfetch now 2026-05-30 12:48:07 +01:00
nikkuss 8969f1cb5c bump nixpkgs 2026-05-30 12:48:07 +01:00
nikkuss 67ca4c6edb bump firwmware version 2026-05-30 12:48:07 +01:00
nikkuss 888d1338cd refactor(flightcore): consume source from nvfetcher generated.nix (#14)
Reviewed-on: nikkuss/pkgs#14
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:07 +01:00
nikkuss 9927693901 bump firwmware version (#13)
Reviewed-on: nikkuss/pkgs#13
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:06 +01:00
doloro c7c53eafae fix: uses rev from nvfetcher 2026-05-30 12:45:54 +01:00
doloro 8d618dff18 fix: bumped electron on grimoire 2026-05-30 12:40:33 +01:00
doloro cccc55ef78 lint: removed some comments 2026-05-29 14:35:07 +01:00
doloro 2917e84200 fix: vpkmerge and grimorie are using nvfetch now 2026-05-29 14:30:40 +01:00
doloro cb70ca0e90 add: vpkmerge (used by grimorie) 2026-05-29 14:30:17 +01:00
doloro c2e51153c5 lint 2026-05-29 12:02:03 +01:00
doloro 6a2f59785b add: grimorie (deadlock mod manager) 2026-05-29 11:47:53 +01:00
+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