rquickshare: fix darwin build (#407529)

This commit is contained in:
Aleksana 2025-05-16 21:36:31 +08:00 committed by GitHub
commit 5599f0b19b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 57 additions and 34 deletions

View file

@ -35,7 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "..."; hash = "...";
}; };
nativeBuildInputs = [ nativeBuildInputs =
[
# Pull in our main hook # Pull in our main hook
cargo-tauri.hook cargo-tauri.hook
@ -45,6 +46,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
# Make sure we can find our libraries # Make sure we can find our libraries
pkg-config pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4 wrapGAppsHook4
]; ];

View file

@ -69,10 +69,14 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoRoot = "app/${app-type}/src-tauri"; cargoRoot = "app/${app-type}/src-tauri";
buildAndTestSubdir = cargoRoot; buildAndTestSubdir = cargoRoot;
cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ]; cargoPatches = [
./remove-duplicate-versions-of-sys-metrics.patch
./remove-code-signing-darwin.patch
];
cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w="; cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w=";
nativeBuildInputs = [ nativeBuildInputs =
[
proper-cargo-tauri.hook proper-cargo-tauri.hook
# Setup pnpm # Setup pnpm
@ -83,12 +87,15 @@ rustPlatform.buildRustPackage rec {
perl perl
pkg-config pkg-config
protobuf protobuf
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4 wrapGAppsHook4
]; ];
buildInputs = buildInputs =
[ openssl ] [ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux (
[
glib-networking glib-networking
libayatana-appindicator libayatana-appindicator
] ]
@ -99,7 +106,8 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals (app-type == "legacy") [ ++ lib.optionals (app-type == "legacy") [
webkitgtk_4_0 webkitgtk_4_0
libsoup_2_4 libsoup_2_4
]; ]
);
passthru = passthru =
# Don't set an update script for the legacy version # Don't set an update script for the legacy version

View file

@ -0,0 +1,12 @@
diff --git a/app/main/src-tauri/tauri.conf.json b/app/main/src-tauri/tauri.conf.json
index 1114b19..c4cc8f4 100644
--- a/app/main/src-tauri/tauri.conf.json
+++ b/app/main/src-tauri/tauri.conf.json
@@ -23,7 +23,6 @@
"macOS": {
"frameworks": [],
"exceptionDomain": "",
- "signingIdentity": "-",
"providerShortName": null,
"entitlements": null
},