alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

I take back r32860; I'll try to fix libwpd_08

Browse source 
svn path=/nixpkgs/trunk/; revision=32870
This commit is contained in:
Lluís Batlle i Rossell 2012-03-07 22:34:54 +00:00
parent b2653605c4
commit dc0fd8219c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/office/openoffice/go-oo.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip { 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 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , 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 sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in 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 --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
''; '';
@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 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 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 libXinerama openssl gperf GConf ORBit2 cups libXinerama openssl gperf GConf ORBit2

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

@ -7124,6 +7124,7 @@ let
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2; inherit (gnome) GConf ORBit2;
neon = neon029; neon = neon029;
libwpd = libwpd_08;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
}; };