1 files changed, 15 insertions, 1 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
index 2728d8484ef1..e07fecbf8936 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
@@ -35,7 +35,21 @@ stdenv.mkDerivation rec {
                 ++ stdenv.lib.optional enableXXHash xxHash;
   nativeBuildInputs = [perl];
 
-  configureFlags = ["--with-nobody-group=nogroup"];
+  configureFlags = [
+    "--with-nobody-group=nogroup"
+
+    # 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
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no"
+  ;
 
   passthru.tests = { inherit (nixosTests) rsyncd; };