mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
bzip2 dependency added in a couple of places
svn path=/nixpkgs/trunk/; revision=9702
This commit is contained in:
parent
9c031cec1b
commit
dded839300
@ -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];
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ args.stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs =(with args; [zlib imagemagick libpng glib
|
||||
pkgconfig libgsf libxml2]);
|
||||
pkgconfig libgsf libxml2 bzip2]);
|
||||
|
||||
meta = {
|
||||
description = "
|
||||
|
@ -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;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user