Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc/tauri: use tauri 2.0 dependencies & new darwin SDK pattern in example #357148

Merged
merged 2 commits into from
Dec 4, 2024
Merged

doc/tauri: use tauri 2.0 dependencies & new darwin SDK pattern in example #357148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad104ad
doc/tauri: use tauri 2.0 dependencies in example
getchoo Nov 19, 2024
81d4b87
doc/tauri: use new darwin SDK pattern in example
getchoo Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions doc/hooks/tauri.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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";
Expand Down
Loading