Added 3 more missing xlibs which have to be put in LD_LIBRARY_PATH to openoffice.
svn path=/nixpkgs/trunk/; revision=9271
This commit is contained in:
parent
4db66d7ce6
commit
82994290e6
@ -2,7 +2,7 @@
|
|||||||
, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
|
, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
|
||||||
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
|
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
|
||||||
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which
|
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which
|
||||||
, icu, boost, jdk, ant, hsqldb, libXext
|
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -50,13 +50,15 @@ stdenv.mkDerivation rec {
|
|||||||
--with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
|
--with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
|
||||||
";
|
";
|
||||||
|
|
||||||
|
LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${libXext}/lib:${libX11}/lib:${libXtst}/lib";
|
||||||
|
|
||||||
with_jdk_home = jdk;
|
with_jdk_home = jdk;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
|
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
|
||||||
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
|
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
|
||||||
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
|
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
|
||||||
getopt file jdk cairo which icu boost libXext
|
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit icu fontconfig;
|
inherit icu fontconfig;
|
||||||
|
Loading…
Reference in New Issue
Block a user