From dded839300672968e01bf45d0ac02e245031a22a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 16 Nov 2007 03:45:42 +0000
Subject: [PATCH] bzip2 dependency added in a couple of places

svn path=/nixpkgs/trunk/; revision=9702
---
 pkgs/development/libraries/libwpd/default.nix | 5 ++---
 pkgs/tools/misc/wv/default.nix                | 2 +-
 pkgs/top-level/all-packages.nix               | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 13723fdeb85..630eb44753b 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,10 +1,9 @@
-{stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2}:
-
+args: with args;
 stdenv.mkDerivation {
   name = "libwpd-0.8.5";
   src = fetchurl {
     url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz;
     md5 = "6b679e205a2805c3d23f41c65b35e266";
   };
-  buildInputs = [pkgconfig glib libgsf libxml2];
+  buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
 }
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 141bf91bee0..1bf88edef2a 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -9,7 +9,7 @@ args.stdenv.mkDerivation {
 	};
 
   buildInputs =(with args; [zlib imagemagick libpng glib
-	pkgconfig libgsf libxml2]);
+	pkgconfig libgsf libxml2 bzip2]);
 
   meta = {
     description = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb2e383cb20..b9ecbbf0360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,7 +755,7 @@ rec {
 
   wv = import ../tools/misc/wv {
     inherit fetchurl stdenv libpng zlib imagemagick
-	pkgconfig libgsf libxml2;
+	pkgconfig libgsf libxml2 bzip2;
     inherit (gtkLibs) glib;
   };
 
@@ -2057,7 +2057,7 @@ rec {
   };
 
   libwpd = import ../development/libraries/libwpd {
-    inherit fetchurl stdenv pkgconfig libgsf libxml2;
+    inherit fetchurl stdenv pkgconfig libgsf libxml2 bzip2;
     inherit (gnome) glib;
   };