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

Revert "Fixing LibreOffice configure for now"

Browse Source 
This reverts commit 9e4bee5270adbfa498eb1bc36be58fac753aaaf7.
This commit is contained in:
Mathijs Kwik 2013-06-05 22:51:21 +02:00
parent 619b024600
commit a479aafb75
2 changed files with 6 additions and 14 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,9 +7,7 @@
, 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, libdrm , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
, 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" ]
}: }:
@ -165,18 +163,13 @@ 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 damageproto CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
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 libdrm hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg
libexttextcat libiodbc libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libxcb libXdamage libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
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 xf86vidmodeproto python sablotron saneBackends tcsh unzip vigra which zip zlib
which zip zlib
]; ];
meta = { meta = {

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

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