b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "rsync: Work around upstream cross-compilation issue"

Browse source 
This reverts commit 49edde0905.

Our packaged rsync version now contains the fix.
This commit is contained in:
Alyssa Ross 2022-07-29 19:57:16 +00:00
parent 6c93364cc2
commit bf0aa68088
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/sync/rsync/default.nix
View file

@ -53,14 +53,7 @@ stdenv.mkDerivation rec {
# disable the included zlib explicitly as it otherwise still compiles and
# links them even.
"--with-included-zlib=no"
]
# 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
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no";
];
enableParallelBuilding = true;