From ebe24fe90d28ec79052264dfce8b69f59abe3cda Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 00:31:45 -0500 Subject: [PATCH] doc/tauri: use tauri 2.0 dependencies & new darwin SDK pattern in example (#357148) * doc/tauri: use tauri 2.0 dependencies in example * doc/tauri: use new darwin SDK pattern in example Part of https://github.com/NixOS/nixpkgs/issues/354146 (cherry picked from commit ed6c067f2560086fa2b0b73cc7fe11617cc224c1) --- doc/hooks/tauri.section.md | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 2713515015dd8..3fad872e4306e 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -14,15 +14,13 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. rustPlatform, fetchNpmDeps, cargo-tauri, - darwin, glib-networking, - libsoup, nodejs, npmHooks, openssl, pkg-config, - webkitgtk_4_0, - wrapGAppsHook3, + webkitgtk_4_1, + wrapGAppsHook4, }: rustPlatform.buildRustPackage rec { @@ -47,25 +45,15 @@ rustPlatform.buildRustPackage rec { # Make sure we can find our libraries pkg-config - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking # Most Tauri apps need networking - libsoup - webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - Security - WebKit - ] - ); + webkitgtk_4_1 + ]; # Set our Tauri source directory cargoRoot = "src-tauri";