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.

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

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Nov 19, 2024

Part of #354146

Follow up to #346277

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@getchoo getchoo added the backport release-24.11 Backport PR automatically label Nov 19, 2024
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Nov 19, 2024
Copy link
Contributor

@Eveeifyeve Eveeifyeve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just need to test this pr before I can say it's a good to go.

@pluiedev
Copy link
Contributor

I think libsoup is still required, but with libsoup_3 instead of libsoup

@pluiedev
Copy link
Contributor

pluiedev commented Nov 22, 2024

And BTW, should also mention that libayatana-appindicator or libappindicator is required on Linux if the app has the tray-icon feature enabled (see https://github.com/tauri-apps/tauri/blob/f884bae75b3ad8f8debfd29bb05ac9cbc9748c89/crates/tauri-cli/src/interface/rust.rs#L1242-L1267), otherwise the build would die with a hard crash; it also needs to be added to the LD_LIBRARY_PATH of the executable

@getchoo
Copy link
Member Author

getchoo commented Nov 22, 2024

I think libsoup is still required, but with libsoup_3 instead of libsoup

webkitgtk_4_1 already uses it and propagates it

And BTW, should also mention that libayatana-appindicator or libappindicator is required on Linux if the app has the tray-icon feature enabled (see https://github.com/tauri-apps/tauri/blob/f884bae75b3ad8f8debfd29bb05ac9cbc9748c89/crates/tauri-cli/src/interface/rust.rs#L1242-L1267)

This would be better in a separate PR (and was actually missing from the v1 documentation as well). We should also try to avoid LD_LIBRARY_PATH hacks and opt instead of forcing linking through linker args/patching -- as done here for example

@getchoo getchoo merged commit ed6c067 into NixOS:master Dec 4, 2024
31 checks passed
@getchoo getchoo deleted the doc/tauri/2.0 branch December 4, 2024 05:31
@nixpkgs-ci
Copy link

nixpkgs-ci bot commented Dec 4, 2024

nixpkgs-ci bot pushed a commit that referenced this pull request Dec 4, 2024
…mple (#357148)

* doc/tauri: use tauri 2.0 dependencies in example

* doc/tauri: use new darwin SDK pattern in example

Part of #354146

(cherry picked from commit ed6c067)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants