From c3e38d11f0937e61dba673e369b333b7e08921af Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 1 Apr 2010 18:50:43 +0000
Subject: [PATCH] Bump libarchive to 2.8.3

Fixes kdeutils-4.4.2 compilation

svn path=/nixpkgs/trunk/; revision=20922
---
 pkgs/development/libraries/libarchive/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                   |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 744554c338f6..9782948ba53a 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,14 +1,15 @@
-{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}:
+{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs
+, sharutils}:
 
 stdenv.mkDerivation rec {
-  name = "libarchive-2.4.12";
+  name = "libarchive-2.8.3";
 
   src = fetchurl {
-    url = "${meta.homepage}/src/${name}.tar.gz";
-    sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4";
+    url = "http://libarchive.googlecode.com/files/${name}.tar.gz";
+    sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
   };
 
-  propagatedBuildInputs = [zlib bzip2 e2fsprogs];
+  propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl];
   
   buildInputs = [sharutils];
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 993fba544315..275c5a9f7069 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4133,7 +4133,8 @@ let
   };
 
   libarchive = import ../development/libraries/libarchive {
-    inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils;
+    inherit fetchurl stdenv acl zlib bzip2 e2fsprogs xz sharutils libxml2
+      openssl attr;
   };
 
   libassuan = import ../development/libraries/libassuan {