movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 20:25:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

rquickshare: fix darwin build (#407529)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

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

56
pkgs/by-name/rq/rquickshare/package.nix
View file

@ -69,37 +69,45 @@ 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
nodejs nodejs
pnpm_9.configHook pnpm_9.configHook
# Make sure we can find our libraries # Make sure we can find our libraries
perl perl
pkg-config pkg-config
protobuf protobuf
wrapGAppsHook4 ]
]; ++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4
];
buildInputs = buildInputs =
[ openssl ] [ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux (
glib-networking [
libayatana-appindicator glib-networking
] libayatana-appindicator
++ lib.optionals (app-type == "main") [ ]
webkitgtk_4_1 ++ lib.optionals (app-type == "main") [
libsoup_3 webkitgtk_4_1
] libsoup_3
++ lib.optionals (app-type == "legacy") [ ]
webkitgtk_4_0 ++ lib.optionals (app-type == "legacy") [
libsoup_2_4 webkitgtk_4_0
]; 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

12
pkgs/by-name/rq/rquickshare/remove-code-signing-darwin.patch Normal file
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
},