diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 59cd517b55cd..d6234e9b3afb 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, libwpd +, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype , 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 --with-system-libwpd --without-git --with-system-cairo \ + ./configure --with-distro=SUSE-11.1 --without-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 libwpd libxml2 db4 sablotron curl + libjpeg expat pkgconfig freetype 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 658f68255b97..59ddb6335d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7126,7 +7126,6 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon029; - libwpd = libwpd_08; zip = zip.override { enableNLS = false; }; };