From 3156263876719c75ef5d98c36d701363eb4565ef Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 26 Jun 2017 03:09:36 +0200 Subject: rsync: build with iconv, zlib & popt from nixpkgs The rsync binary was previously built without iconv support which is needed for utf-8 conversions on darwin. Fixes #26864. Additionally rsync used to be built with bundled versions of zlib and popt that were outdated. This decreases the size of the rsync binary by ~82KB. --- pkgs/applications/networking/sync/rsync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/networking/sync') diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 53b723f5ec2a..b24be07b8eec 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; - buildInputs = stdenv.lib.optional enableACLs acl; + buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl; nativeBuildInputs = [perl]; - configureFlags = "--with-nobody-group=nogroup"; + configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"]; meta = base.meta // { description = "A fast incremental file transfer utility"; -- cgit 1.4.1