public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101204 from samueldr/fix/rsync-cross-compilation-regression 

rsync: Work around upstream cross-compilation issue
This commit is contained in:
Samuel Dionne-Riel 2020-10-26 15:05:10 -04:00 committed by GitHub
parent bcbb5833a0 49edde0905
commit 9119d715dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -35,7 +35,15 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableXXHash xxHash; ++ stdenv.lib.optional enableXXHash xxHash;
nativeBuildInputs = [perl]; 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; }; passthru.tests = { inherit (nixosTests) rsyncd; };