* Woohoo, OpenOffice finally builds. And it even runs :-) Saving
now works as well. Small detail: you have to set LD_LIBRARY_PATH to libjpeg at runtime. Will fix. svn path=/nixpkgs/trunk/; revision=9276
This commit is contained in:
parent
a1022416c5
commit
366743f163
@ -1,7 +1,5 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
|
|
||||||
echo $with_jdk_home
|
|
||||||
|
|
||||||
export nodep=TRUE
|
export nodep=TRUE
|
||||||
export NO_HIDS=TRUE
|
export NO_HIDS=TRUE
|
||||||
|
|
||||||
@ -9,9 +7,7 @@ export PATH=$icu/sbin:$PATH
|
|||||||
|
|
||||||
preConfigure=preConfigure
|
preConfigure=preConfigure
|
||||||
preConfigure() {
|
preConfigure() {
|
||||||
for i in \
|
for i in sysui/desktop/share/makefile.mk; do
|
||||||
sysui/desktop/share/makefile.mk \
|
|
||||||
; do
|
|
||||||
substituteInPlace $i --replace /bin/bash $shell
|
substituteInPlace $i --replace /bin/bash $shell
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -21,7 +17,16 @@ preConfigure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
postConfigure="cd .."
|
postConfigure=postConfigure
|
||||||
|
postConfigure() {
|
||||||
|
cd ..
|
||||||
|
for i in LinuxX86Env.Set LinuxX86Env.Set.sh; do
|
||||||
|
substituteInPlace $i --replace /usr /no-such-path
|
||||||
|
done
|
||||||
|
substituteInPlace solenv/inc/libs.mk \
|
||||||
|
--replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \
|
||||||
|
--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
buildPhase=buildPhase
|
buildPhase=buildPhase
|
||||||
|
@ -50,9 +50,7 @@ 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:${libXi}/lib";
|
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
|
||||||
|
|
||||||
with_jdk_home = jdk;
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
|
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
|
||||||
@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||||||
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit icu fontconfig;
|
inherit icu fontconfig libjpeg;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "OpenOffice.org is a multiplatform and multilingual office suite";
|
description = "OpenOffice.org is a multiplatform and multilingual office suite";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user