From b54251026ac1322d73b24a0dee5ed8b0bf4e8ac3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Feb 2009 22:13:35 +0000
Subject: [PATCH] * Enable ACL support in rsync.

svn path=/nixpkgs/trunk/; revision=13976
---
 .../applications/networking/sync/rsync/default.nix | 14 +++++++++++++-
 pkgs/top-level/all-packages.nix                    |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index cba78189789f..cf82b517f7e4 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,9 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl
+, enableACLs ? true, acl ? null
+}:
+
+assert enableACLs -> acl != null;
 
 stdenv.mkDerivation {
   name = "rsync-3.0.5";
+  
   src = fetchurl {
     url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.5.tar.gz;
     sha256 = "1js36yv5s9dic524s7jczqk5myzp67bp24rqhbnikg6lh6pj1b20";
   };
+
+  buildInputs = stdenv.lib.optional enableACLs acl;
+
+  meta = {
+    homepage = http://samba.anu.edu.au/rsync/;
+    description = "A fast incremental file transfer utility";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11b595e601fd..15f9d4941310 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7939,7 +7939,7 @@ let
   };
 
   rsync = import ../applications/networking/sync/rsync {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv acl;
   };
 
   rxvt = import ../applications/misc/rxvt {