From f555da864d68528a6fc45a95c96028a8a3cd1b78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jul 2010 15:30:25 +0000
Subject: [PATCH] * dar: build with --disable-dar-static, apparently the zlib
 update   broke it.  Also upgrade to 2.3.10 and turn on ACL support.

svn path=/nixpkgs/branches/x-updates/; revision=22690
---
 pkgs/tools/archivers/dar/default.nix | 21 ++++++++++++---------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index e096313a4c16..49c56d075d30 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchurl, zlib, bzip2, openssl}:
+{ stdenv, fetchurl, zlib, bzip2, openssl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.3.9";
+  name = "dar-2.3.10";
+  
   src = fetchurl {
-    url = "mirror://sourceforge/dar/dar-2.3.9.tar.gz";
-    sha256 = "037ak6wckqyn52000m8bapgnf70rw776dl3s61i9bdq548slq6yc";
+    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn";
   };
 
-  buildInputs = [zlib bzip2 openssl];
+  buildInputs = [ zlib bzip2 openssl attr ];
+
+  configureFlags = "--disable-dar-static";
 
   meta = {
-	  homepage = http://dar.linux.free.fr/;
-	  description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = http://dar.linux.free.fr/;
+    description = "Disk ARchiver, allows backing up files into indexed archives";
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a547f870d5a..9ac8ade3ed8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -606,7 +606,7 @@ let
   };
 
   dar = import ../tools/archivers/dar {
-    inherit fetchurl stdenv zlib bzip2 openssl;
+    inherit fetchurl stdenv zlib bzip2 openssl attr;
   };
 
   davfs2 = import ../tools/filesystems/davfs2 {