From 7fe4f51562e8200b889a47dcf3f19c4445fc285d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Jul 2023 03:55:50 -0700 Subject: [PATCH 1/2] librclone: fix build The `patches` introduced in https://github.com/NixOS/nixpkgs/pull/241863 lead to a `vendorSha256` mismatch if not also applied in librclone. --- pkgs/development/libraries/librclone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/development/libraries/librclone/default.nix index 3b8bf83364c9..3c6a1f407f65 100644 --- a/pkgs/development/libraries/librclone/default.nix +++ b/pkgs/development/libraries/librclone/default.nix @@ -8,7 +8,7 @@ let ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildGoModule rec { pname = "librclone"; - inherit (rclone) version src vendorSha256; + inherit (rclone) version src patches vendorSha256; buildPhase = '' runHook preBuild From 3d30a2c8a17a1d5e8201cf59a969d08a0ed70fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Jul 2023 04:02:29 -0700 Subject: [PATCH 2/2] rclone: add librclone to passthru.tests --- pkgs/applications/networking/sync/rclone/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index a7b269378ea8..4900b9546952 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch , makeWrapper , enableCmount ? true, fuse, macfuse-stubs +, librclone }: buildGoModule rec { @@ -58,6 +59,10 @@ buildGoModule rec { --prefix LD_LIBRARY_PATH : "${fuse}/lib" ''; + passthru.tests = { + inherit librclone; + }; + meta = with lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "https://rclone.org";