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

refactor(flightcore): consume source from nvfetcher generated.nix #14

Merged
nikkuss merged 1 commits from refactor-flightcore-nvfetcher into main 2026-05-29 17:39:58 +04:00
Conversation 0 Commits 1 Files Changed 1
+47 -50
1 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b5c7e560b - Show all commits
pkgs/by-name/fl/flightcore/package.nix
+47 -50
View File
@@ -13,61 +13,58 @@
pkg-config, pkg-config,
webkitgtk_4_1, webkitgtk_4_1,
wrapGAppsHook4, wrapGAppsHook4,
fetchFromGitHub, callPackage,
}: }: let
rustPlatform.buildRustPackage (finalAttrs: { sources = callPackage ../../../../_sources/generated.nix {};
pname = "flightcore"; in
version = "3.2.0"; rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub { pname = "flightcore";
owner = "R2NorthstarTools"; version = lib.removePrefix "v" sources.flightcore.version;
repo = "FlightCore"; inherit (sources.flightcore) src;
rev = "v${finalAttrs.version}"; patches = [./cargo-lock.patch];
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI="; cargoDeps = rustPlatform.fetchCargoVendor {
}; src = finalAttrs.src;
patches = [./cargo-lock.patch]; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
cargoDeps = rustPlatform.fetchCargoVendor { hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
src = finalAttrs.src; patchFlags = "-p2";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; inherit (finalAttrs) patches;
hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU="; };
patchFlags = "-p2"; postPatch = ''
inherit (finalAttrs) patches; jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
}; '';
postPatch = '' npmDeps = fetchNpmDeps {
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
''; src = "${finalAttrs.src}/src-vue";
npmDeps = fetchNpmDeps { hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; };
src = "${finalAttrs.src}/src-vue";
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
};
nativeBuildInputs = nativeBuildInputs =
[ [
cargo-tauri.hook cargo-tauri.hook
nodejs nodejs
npmHooks.npmConfigHook npmHooks.npmConfigHook
pkg-config pkg-config
jq jq
moreutils moreutils
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4]; ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
openssl openssl
webkitgtk_4_1 webkitgtk_4_1
]; ];
cargoRoot = "src-tauri"; cargoRoot = "src-tauri";
npmRoot = "src-vue"; npmRoot = "src-vue";
buildAndTestSubdir = finalAttrs.cargoRoot; buildAndTestSubdir = finalAttrs.cargoRoot;
meta = { meta = {
platforms = ["x86_64-linux"]; platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager"; description = "FlightCore A Northstar installer, updater, and mod-manager";
}; };
}) })