movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2024-11-12 06:05:05 +00:00 • committed by GitHub
commit 00b1e226f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 648 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/hooks/tauri.section.md
View file

@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ openssl ]
++ lib.optionals stdenv.isLinux [
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking # Most Tauri apps need networking
libsoup
webkitgtk_4_0
]
++ lib.optionals stdenv.isDarwin (
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit