movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

rquickshare: clean up dependencies, don't use applyPatches (#407775)

Browse source
This commit is contained in:
Aleksana 2025-05-23 20:28:07 +08:00 • committed by GitHub
commit ead6646f4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@
cargo-tauri, cargo-tauri,
cargo-tauri_1, cargo-tauri_1,
fetchFromGitHub, fetchFromGitHub,
applyPatches,
glib-networking, glib-networking,
libayatana-appindicator, libayatana-appindicator,
libsoup_2_4, libsoup_2_4,
@ -11,7 +10,6 @@
nix-update, nix-update,
nodejs, nodejs,
openssl, openssl,
perl,
pkg-config, pkg-config,
pnpm_9, pnpm_9,
protobuf, protobuf,
@ -42,16 +40,15 @@ rustPlatform.buildRustPackage rec {
pname = "rquickshare" + (app-type-either "" "-legacy"); pname = "rquickshare" + (app-type-either "" "-legacy");
version = "0.11.5"; version = "0.11.5";
src = applyPatches { src = fetchFromGitHub {
src = fetchFromGitHub { owner = "Martichou";
owner = "Martichou"; repo = "rquickshare";
repo = "rquickshare"; tag = "v${version}";
tag = "v${version}"; hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA=";
hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA=";
};
patches = [ ./fix-pnpm-outdated-lockfile.patch ];
}; };
patches = [ ./fix-pnpm-outdated-lockfile.patch ];
# from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
@ -60,9 +57,13 @@ rustPlatform.buildRustPackage rec {
pnpmRoot = "app/${app-type}"; pnpmRoot = "app/${app-type}";
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src; inherit
pname
sourceRoot = "${src.name}/app/${app-type}"; version
src
patches
;
postPatch = "cd ${pnpmRoot}";
hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs="; hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
}; };
@ -83,31 +84,30 @@ rustPlatform.buildRustPackage rec {
nodejs nodejs
pnpm_9.configHook pnpm_9.configHook
# Make sure we can find our libraries
perl
pkg-config
protobuf protobuf
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
wrapGAppsHook4 wrapGAppsHook4
]; ];
buildInputs = buildInputs = lib.optionals stdenv.hostPlatform.isLinux (
[ openssl ] [
++ lib.optionals stdenv.hostPlatform.isLinux ( glib-networking
[ libayatana-appindicator
glib-networking openssl
libayatana-appindicator ]
] ++ lib.optionals (app-type == "main") [
++ lib.optionals (app-type == "main") [ libsoup_3
webkitgtk_4_1 webkitgtk_4_1
libsoup_3 ]
] ++ lib.optionals (app-type == "legacy") [
++ lib.optionals (app-type == "legacy") [ libsoup_2_4
webkitgtk_4_0 webkitgtk_4_0
libsoup_2_4 ]
] );
);
env.OPENSSL_NO_VENDOR = 1;
passthru = passthru =
# Don't set an update script for the legacy version # Don't set an update script for the legacy version