Author: viric
Date: Wed Mar 7 22:34:54 2012
New Revision: 32870
URL: https://nixos.org/websvn/nix/?rev=32870&sc=1
Log:
I take back r32860; I'll try to fix libwpd_08
Modified:
nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix Wed Mar 7
22:21:24 2012 (r32869)
+++ nixpkgs/trunk/pkgs/applications/office/openoffice/go-oo.nix Wed Mar 7
22:34:54 2012 (r32870)
@@ -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 @@
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 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 7 22:21:24
2012 (r32869)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 7 22:34:54
2012 (r32870)
@@ -7124,6 +7124,7 @@
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2;
neon = neon029;
+ libwpd = libwpd_08;
zip = zip.override { enableNLS = false; };
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
