OOo2 also needs "file", otherwise it will "spin right round, baby, right round, like a record, baby" during compilation

svn path=/nixpkgs/trunk/; revision=4152
This commit is contained in:
Armijn Hemel 2005-10-26 22:04:34 +00:00
parent 6dfc121001
commit 6826026cf3
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{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, gtk, libmspack, getopt}:
{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, gtk, libmspack, getopt, file}:
stdenv.mkDerivation {
name = "openoffice.org-2.0.0";
@ -7,5 +7,5 @@ stdenv.mkDerivation {
url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.0.0/OOo_2.0.0_src.tar.gz;
md5 = "a68933afc2bf432d11b2043ac99ba0aa";
};
buildInputs = [pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip gtk libmspack getopt];
buildInputs = [pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libXaw fontconfig libsndfile neon bison flex zip gtk libmspack getopt file];
}

View File

@ -1420,7 +1420,7 @@ rec {
### APPLICATIONS
openoffice = (import ../applications/office/openoffice) {
inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon flex zip libmspack getopt;
inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon flex zip libmspack getopt file;
inherit (xlibs) libXaw fontconfig;
inherit (gtkLibs) gtk;