diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-07-29 19:57:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-07-29 20:00:04 +0000 |
| commit | bf0aa680881de6d6523b73b35b3f66977ded3c93 (patch) | |
| tree | c932fd42a4d199cd128f8c173ac10b7156f4aa0f /pkgs/applications/networking/sync | |
| parent | 6c93364cc2fb61e6be2d2cad687d516959638763 (diff) | |
| download | nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar.gz nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar.bz2 nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar.lz nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar.xz nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.tar.zst nixpkgs-bf0aa680881de6d6523b73b35b3f66977ded3c93.zip | |
Revert "rsync: Work around upstream cross-compilation issue"
This reverts commit 49edde0905978bf3420498663c05ab4571da90a7. Our packaged rsync version now contains the fix.
Diffstat (limited to 'pkgs/applications/networking/sync')
| -rw-r--r-- | pkgs/applications/networking/sync/rsync/default.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index c2a1136c972..5e0ddc69a46 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -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; |