From f7e0e07f4ad68fc7d1154cc3d4ebf878fbf2f7a2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 6 Jul 2023 04:20:00 +0000 Subject: [PATCH] rclone: fix build on aarch64-darwin Fixes https://github.com/NixOS/nixpkgs/issues/241706 --- .../applications/networking/sync/rclone/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 95dc33120aa2..a7b269378ea8 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch , makeWrapper , enableCmount ? true, fuse, macfuse-stubs }: @@ -14,7 +14,16 @@ buildGoModule rec { hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI="; }; - vendorSha256 = "sha256-0YenfRa5udTrajPLI1ZMV+NYDHKO++M0KvIvr4gYLLc="; + patches = [ + # Fix build on aarch64-darwin. Remove with the next release. + # https://github.com/rclone/rclone/pull/7099 + (fetchpatch { + url = "https://github.com/rclone/rclone/commit/fb5125ecee4ae1061ff933bb3b9b19243e022241.patch"; + hash = "sha256-3SzU9iiQM8zeL7VQhmq0G6e0km8WBRz4BSplRLE1vpM="; + }) + ]; + + vendorSha256 = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; subPackages = [ "." ];