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.
This commit is contained in:
parent
1a25495b63
commit
3156263876
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, perl
|
{ stdenv, fetchurl, perl, libiconv, zlib, popt
|
||||||
, enableACLs ? true, acl ? null
|
, enableACLs ? true, acl ? null
|
||||||
, enableCopyDevicesPatch ? false
|
, enableCopyDevicesPatch ? false
|
||||||
}:
|
}:
|
||||||
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
|||||||
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
|
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
|
||||||
patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
|
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];
|
nativeBuildInputs = [perl];
|
||||||
|
|
||||||
configureFlags = "--with-nobody-group=nogroup";
|
configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"];
|
||||||
|
|
||||||
meta = base.meta // {
|
meta = base.meta // {
|
||||||
description = "A fast incremental file transfer utility";
|
description = "A fast incremental file transfer utility";
|
||||||
|
Loading…
Reference in New Issue
Block a user