From ad104ade94f48d74f2c8501b3411970eb5793546 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 18 Nov 2024 22:50:27 -0500 Subject: [PATCH 1/2] doc/tauri: use tauri 2.0 dependencies in example --- doc/hooks/tauri.section.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 2713515015dd8..db8d36739a7b2 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -16,13 +16,12 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. cargo-tauri, darwin, glib-networking, - libsoup, nodejs, npmHooks, openssl, pkg-config, - webkitgtk_4_0, - wrapGAppsHook3, + webkitgtk_4_1, + wrapGAppsHook4, }: rustPlatform.buildRustPackage rec { @@ -47,15 +46,14 @@ 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 + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 81d4b87c3a82bf75ecce7a29ed46c0984567e165 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 18 Nov 2024 22:51:40 -0500 Subject: [PATCH 2/2] doc/tauri: use new darwin SDK pattern in example Part of https://github.com/NixOS/nixpkgs/issues/354146 --- doc/hooks/tauri.section.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index db8d36739a7b2..3fad872e4306e 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -14,7 +14,6 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. rustPlatform, fetchNpmDeps, cargo-tauri, - darwin, glib-networking, nodejs, npmHooks, @@ -54,16 +53,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking # Most Tauri apps need networking webkitgtk_4_1 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - Security - WebKit - ] - ); + ]; # Set our Tauri source directory cargoRoot = "src-tauri";