From 51038c5b6c7d5872605ac64b3523d54a6df48cfa Mon Sep 17 00:00:00 2001 From: Nikkuss Date: Mon, 27 Oct 2025 18:45:17 +0400 Subject: [PATCH] flightcore: cleanup --- pkgs/by-name/fl/flightcore/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/fl/flightcore/package.nix b/pkgs/by-name/fl/flightcore/package.nix index 8a9166b..01d9864 100644 --- a/pkgs/by-name/fl/flightcore/package.nix +++ b/pkgs/by-name/fl/flightcore/package.nix @@ -14,7 +14,6 @@ webkitgtk_4_1, wrapGAppsHook4, fetchFromGitHub, - breakpointHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -37,9 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json ''; - # cargoHash = "sha256-qh8mHDgIwh20I8P8rx25CZIVB8X4ZtY7/lyGQ3xy/7k="; - - # Assuming our app's frontend uses `npm` as a package manager npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/src-vue"; @@ -47,36 +43,30 @@ rustPlatform.buildRustPackage (finalAttrs: { }; nativeBuildInputs = [ - # Pull in our main hook cargo-tauri.hook - # Setup npm nodejs npmHooks.npmConfigHook - # Make sure we can find our libraries pkg-config jq moreutils - breakpointHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - glib-networking # Most Tauri apps need networking + glib-networking openssl webkitgtk_4_1 ]; - # Set our Tauri source directory cargoRoot = "src-tauri"; npmRoot = "src-vue"; - # And make sure we build there too + buildAndTestSubdir = finalAttrs.cargoRoot; meta = { description = "FlightCore A Northstar installer, updater, and mod-manager"; - }; })