This commit is contained in:
		| @@ -14,7 +14,6 @@ | |||||||
|   webkitgtk_4_1, |   webkitgtk_4_1, | ||||||
|   wrapGAppsHook4, |   wrapGAppsHook4, | ||||||
|   fetchFromGitHub, |   fetchFromGitHub, | ||||||
|   breakpointHook, |  | ||||||
| }: | }: | ||||||
|  |  | ||||||
| rustPlatform.buildRustPackage (finalAttrs: { | rustPlatform.buildRustPackage (finalAttrs: { | ||||||
| @@ -37,9 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { | |||||||
|   postPatch = '' |   postPatch = '' | ||||||
|     jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json |     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 { |   npmDeps = fetchNpmDeps { | ||||||
|     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; |     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; | ||||||
|     src = "${finalAttrs.src}/src-vue"; |     src = "${finalAttrs.src}/src-vue"; | ||||||
| @@ -47,36 +43,30 @@ rustPlatform.buildRustPackage (finalAttrs: { | |||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   nativeBuildInputs = [ |   nativeBuildInputs = [ | ||||||
|     # Pull in our main hook |  | ||||||
|     cargo-tauri.hook |     cargo-tauri.hook | ||||||
|  |  | ||||||
|     # Setup npm |  | ||||||
|     nodejs |     nodejs | ||||||
|     npmHooks.npmConfigHook |     npmHooks.npmConfigHook | ||||||
|  |  | ||||||
|     # Make sure we can find our libraries |  | ||||||
|     pkg-config |     pkg-config | ||||||
|  |  | ||||||
|     jq |     jq | ||||||
|     moreutils |     moreutils | ||||||
|     breakpointHook |  | ||||||
|   ] |   ] | ||||||
|   ++ 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 # Most Tauri apps need networking |     glib-networking | ||||||
|     openssl |     openssl | ||||||
|     webkitgtk_4_1 |     webkitgtk_4_1 | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   # Set our Tauri source directory |  | ||||||
|   cargoRoot = "src-tauri"; |   cargoRoot = "src-tauri"; | ||||||
|   npmRoot = "src-vue"; |   npmRoot = "src-vue"; | ||||||
|   # And make sure we build there too |  | ||||||
|   buildAndTestSubdir = finalAttrs.cargoRoot; |   buildAndTestSubdir = finalAttrs.cargoRoot; | ||||||
|  |  | ||||||
|   meta = { |   meta = { | ||||||
|     description = "FlightCore A Northstar installer, updater, and mod-manager"; |     description = "FlightCore A Northstar installer, updater, and mod-manager"; | ||||||
|  |  | ||||||
|   }; |   }; | ||||||
| }) | }) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user