* Fix libgsf.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18081
This commit is contained in:
parent
f1f8debe62
commit
6fbcf62941
@ -2,9 +2,12 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "libbonobo-2.24.2";
|
name = "libbonobo-2.24.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2;
|
url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2;
|
||||||
sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m";
|
sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m";
|
||||||
};
|
};
|
||||||
buildInputs = [ flex bison pkgconfig glib dbus_glib libxml2 popt intltool ORBit2 ];
|
|
||||||
|
buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ];
|
||||||
|
propagatedBuildInputs = [ popt glib ORBit2 ];
|
||||||
}
|
}
|
||||||
|
@ -4,17 +4,23 @@
|
|||||||
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libgsf-1.14.9";
|
name = "libgsf-1.14.16";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
|
url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
|
||||||
sha256 = "1mkw60052sd6k9sq8ppz4yra0s3sdinngqi6bcmrj9977zk8yqfi";
|
sha256 = "0249n2hgrcnzphinaxng0cpn7afchg84l4ka4wka9kyv3g58zz8i";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs =
|
||||||
perl perlXMLParser pkgconfig libxml2 glib gettext bzip2
|
[ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ];
|
||||||
gnomevfs libbonobo python intltool
|
|
||||||
];
|
propagatedBuildInputs = [ glib libxml2 libbonobo ];
|
||||||
|
|
||||||
|
preConfigure =
|
||||||
|
''
|
||||||
|
export NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags glib-2.0)"
|
||||||
|
export NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags libbonobo-2.0)"
|
||||||
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user