From 5219a3ade1939470f2965ad4d80c87f7fb33db3e Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 1 Nov 2020 11:38:54 +0100 Subject: [PATCH] rsync: disable the bundled zlib explicitly We've been providing zlib as a buildInput for some time now but rsync still builds (& links) it's own copy of zlib unless we disable it explicitly. This cuts down on compilation time but otherwise shouldn't have any side effects. --- pkgs/applications/networking/sync/rsync/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 7f384846c96..e07fecbf893 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,13 @@ 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.