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,18 +35,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "...";
};
nativeBuildInputs = [
# Pull in our main hook
cargo-tauri.hook
nativeBuildInputs =
[
# Pull in our main hook
cargo-tauri.hook
# Setup npm
nodejs
npmHooks.npmConfigHook
# Setup npm
nodejs
npmHooks.npmConfigHook
# Make sure we can find our libraries
pkg-config
wrapGAppsHook4
];
# Make sure we can find our libraries
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4
];
buildInputs =
[ openssl ]

View file

@ -69,37 +69,45 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoRoot = "app/${app-type}/src-tauri";
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=";
nativeBuildInputs = [
proper-cargo-tauri.hook
nativeBuildInputs =
[
proper-cargo-tauri.hook
# Setup pnpm
nodejs
pnpm_9.configHook
# Setup pnpm
nodejs
pnpm_9.configHook
# Make sure we can find our libraries
perl
pkg-config
protobuf
wrapGAppsHook4
];
# Make sure we can find our libraries
perl
pkg-config
protobuf
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libayatana-appindicator
]
++ lib.optionals (app-type == "main") [
webkitgtk_4_1
libsoup_3
]
++ lib.optionals (app-type == "legacy") [
webkitgtk_4_0
libsoup_2_4
];
++ lib.optionals stdenv.hostPlatform.isLinux (
[
glib-networking
libayatana-appindicator
]
++ lib.optionals (app-type == "main") [
webkitgtk_4_1
libsoup_3
]
++ lib.optionals (app-type == "legacy") [
webkitgtk_4_0
libsoup_2_4
]
);
passthru =
# 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
},