diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-10-20 14:27:09 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-10-20 14:28:27 -0400 |
commit | 49edde0905978bf3420498663c05ab4571da90a7 (patch) | |
tree | a55103f3d72c29c15567549cc1b1c9b991c9ac34 /pkgs/applications/networking/sync | |
parent | 5265d49a36bb5a18c85e6817b338b456acc3b8cc (diff) |
rsync: Work around upstream cross-compilation issue
It should be fixed by the next release: * https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Already a part of the updates for 3.2.4 * https://download.samba.org/pub/rsync/NEWS#3.2.4
Diffstat (limited to 'pkgs/applications/networking/sync')
-rw-r--r-- | pkgs/applications/networking/sync/rsync/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 2728d8484ef12..7f384846c960d 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup"]; + configureFlags = ["--with-nobody-group=nogroup"] + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ; passthru.tests = { inherit (nixosTests) rsyncd; }; |