BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Enable CUPS (printing) support in OpenOffice.

Browse source 
* Add OpenOffice to the channel.

svn path=/nixpkgs/trunk/; revision=9285
This commit is contained in:
Eelco Dolstra 2007-09-10 14:03:01 +00:00
parent b850108d32
commit d6705992aa
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/office/openoffice/builder.sh
View file

@ -47,7 +47,8 @@ wrapSOffice() {
#! $shell
# Add fontconfig to the library search path; apparently OpenOffice
# 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 "\$@"
EOF
chmod +x $out/bin/$fn

8
pkgs/applications/office/openoffice/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
}:
stdenv.mkDerivation rec {
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
configureFlags = "
--with-package-format=native
--disable-cups
--disable-epm
--disable-fontooo
--disable-gnome-vfs
@ -57,9 +56,10 @@ stdenv.mkDerivation rec {
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups
];
inherit icu fontconfig libjpeg;
inherit icu fontconfig libjpeg jdk cups;
meta = {
description = "OpenOffice.org is a multiplatform and multilingual office suite";

3
pkgs/top-level/all-packages.nix
View file

@ -3421,7 +3421,8 @@ rec {
perl perlArchiveZip perlCompressZlib zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2
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 (gtkLibs) gtk;
bison = bison23;

1
pkgs/top-level/build-for-release.nix
View file

@ -116,6 +116,7 @@ let {
nss_ldap
ntp
nxml
openoffice
openssh
openssl
pam_console