git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #101204 from samueldr/fix/rsync-cross-compilation-regression

rsync: Work around upstream cross-compilation issue

commit9119d715dcdd9068addfadb96fa9df31a752da54 authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateMon 26 Oct 2020, 15:05 (6 years ago) parentbcbb58349edde0
1 file changed+9−1
pkgs/applications/networking/sync/rsync/default.nix+9−1
pkgs/applications/networking/sync/rsync/default.nix+9−1
@@ -35,7 +35,15 @@ stdenv.mkDerivation rec {
3535 ++ stdenv.lib.optional enableXXHash xxHash;
3636 nativeBuildInputs = [perl];
3737
38− configureFlags = ["--with-nobody-group=nogroup"];
38+ configureFlags = ["--with-nobody-group=nogroup"]
39+ # Work around issue with cross-compilation:
40+ # configure.sh: error: cannot run test program while cross compiling
41+ # Remove once 3.2.4 or more recent is released.
42+ # The following PR should fix the cross-compilation issue.
43+ # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`.
44+ # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484
45+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"
46+ ;
3947
4048 passthru.tests = { inherit (nixosTests) rsyncd; };
4149