* Enable CUPS (printing) support in OpenOffice.
* Add OpenOffice to the channel. svn path=/nixpkgs/trunk/; revision=9285
This commit is contained in:
parent
b850108d32
commit
d6705992aa
@ -47,7 +47,8 @@ wrapSOffice() {
|
|||||||
#! $shell
|
#! $shell
|
||||||
# Add fontconfig to the library search path; apparently OpenOffice
|
# Add fontconfig to the library search path; apparently OpenOffice
|
||||||
# looks for it at runtime.
|
# looks for it at runtime.
|
||||||
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib
|
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
|
||||||
|
export JAVA_HOME=$jdk
|
||||||
exec $ooFiles/program/soffice $arg "\$@"
|
exec $ooFiles/program/soffice $arg "\$@"
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/bin/$fn
|
chmod +x $out/bin/$fn
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
|
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
|
||||||
, 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, cairo, which
|
||||||
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi
|
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
--with-package-format=native
|
--with-package-format=native
|
||||||
--disable-cups
|
|
||||||
--disable-epm
|
--disable-epm
|
||||||
--disable-fontooo
|
--disable-fontooo
|
||||||
--disable-gnome-vfs
|
--disable-gnome-vfs
|
||||||
@ -57,9 +56,10 @@ stdenv.mkDerivation rec {
|
|||||||
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 libX11 libXtst libXi
|
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
||||||
|
cups
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit icu fontconfig libjpeg;
|
inherit icu fontconfig libjpeg jdk cups;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "OpenOffice.org is a multiplatform and multilingual office suite";
|
description = "OpenOffice.org is a multiplatform and multilingual office suite";
|
||||||
|
@ -3421,7 +3421,8 @@ rec {
|
|||||||
perl perlArchiveZip perlCompressZlib zlib libjpeg
|
perl perlArchiveZip perlCompressZlib zlib libjpeg
|
||||||
expat pkgconfig freetype fontconfig libwpd libxml2
|
expat pkgconfig freetype fontconfig libwpd libxml2
|
||||||
db4 sablotron curl libsndfile flex zip unzip libmspack
|
db4 sablotron curl libsndfile flex zip unzip libmspack
|
||||||
getopt file neon cairo which icu boost jre jdk ant hsqldb;
|
getopt file neon cairo which icu boost jdk ant hsqldb
|
||||||
|
cups;
|
||||||
inherit (xlibs) libXaw libXext libX11 libXtst libXi;
|
inherit (xlibs) libXaw libXext libX11 libXtst libXi;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
bison = bison23;
|
bison = bison23;
|
||||||
|
@ -116,6 +116,7 @@ let {
|
|||||||
nss_ldap
|
nss_ldap
|
||||||
ntp
|
ntp
|
||||||
nxml
|
nxml
|
||||||
|
openoffice
|
||||||
openssh
|
openssh
|
||||||
openssl
|
openssl
|
||||||
pam_console
|
pam_console
|
||||||
|
Loading…
x
Reference in New Issue
Block a user