public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing LibreOffice configure for now

Browse Source
This commit is contained in:
Michael Raskin 2013-06-04 20:00:13 +04:00
parent 73a7586709
commit 9e4bee5270
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/office/libreoffice/default.nix
View File

@ -7,7 +7,9 @@
, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra , libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra
, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio, libdrm
, libXdamage, damageproto, fixesproto, libXfixes, libxcb
, libXxf86vm, xf86vidmodeproto
, fontsConf , fontsConf
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
}: }:
@ -163,13 +165,18 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2 [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2
CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig CompressZlib cppunit cups curl damageproto
db4 dbus_glib expat file fixesproto flex fontconfig
freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg hunspell icu jdk kde4.kdelibs lcms2 libcdr libdrm
libexttextcat libiodbc libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes libXaw libxcb libXdamage
libXext libXfixes libXi libXinerama
libxml2 libxslt libXtst libXxf86vm mdds mesa mythes
neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
python sablotron saneBackends tcsh unzip vigra which zip zlib python sablotron saneBackends tcsh unzip vigra xf86vidmodeproto
which zip zlib
]; ];
meta = { meta = {

3
pkgs/top-level/all-packages.nix
View File

@ -7553,7 +7553,8 @@ let
libreoffice = callPackage ../applications/office/libreoffice { libreoffice = callPackage ../applications/office/libreoffice {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome2) GConf ORBit2 gnome_vfs;
gtk = gtk2;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
boost = boost149; boost = boost149;
jdk = openjdk; jdk = openjdk;