summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-07 22:34:54 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-07 22:34:54 +0000
commitdc0fd8219c3346b7b72bafb5052eca823b774804 (patch)
tree05680b2ac71915656d4014c1959ef57d63a8612d /pkgs/applications/office
parentb2653605c4649dfcd85b9c542462f1f3ea3dedbb (diff)
downloadnixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar.gz
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar.bz2
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar.lz
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar.xz
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.tar.zst
nixpkgs-dc0fd8219c3346b7b72bafb5052eca823b774804.zip
I take back r32860; I'll try to fix libwpd_08
svn path=/nixpkgs/trunk/; revision=32870
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/openoffice/go-oo.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix
index d6234e9b3af..59cd517b55c 100644
--- a/pkgs/applications/office/openoffice/go-oo.nix
+++ b/pkgs/applications/office/openoffice/go-oo.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype
+, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
     echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
 
-    ./configure --with-distro=SUSE-11.1 --without-system-libwpd --without-git --with-system-cairo \
+    ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git --with-system-cairo \
       --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
   '';
 
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
-    libjpeg expat pkgconfig freetype libxml2 db4 sablotron curl 
+    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 libXinerama openssl gperf GConf ORBit2