about summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2013-06-29 11:49:46 +0200
committerMathijs Kwik <mathijs@bluescreen303.nl>2013-07-01 07:52:13 +0200
commit6937609391eebf0be294637db1c40d74ef662b33 (patch)
tree31b17e705fab2a4f7806042a9d1ec22d37d85ae6 /pkgs/applications/office
parentfe622f65232d16808e7be51cb4451a10375a6e24 (diff)
downloadnixlib-6937609391eebf0be294637db1c40d74ef662b33.tar
nixlib-6937609391eebf0be294637db1c40d74ef662b33.tar.gz
nixlib-6937609391eebf0be294637db1c40d74ef662b33.tar.bz2
nixlib-6937609391eebf0be294637db1c40d74ef662b33.tar.lz
nixlib-6937609391eebf0be294637db1c40d74ef662b33.tar.xz
nixlib-6937609391eebf0be294637db1c40d74ef662b33.tar.zst
nixlib-6937609391eebf0be294637db1c40d74ef662b33.zip
clucene_core: upgrade some packages to clucene_core_2
on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs.
so perhaps we can soon drop v1?
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fc5f5058f97b..cd45f76761d9 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , 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, libcdr, lcms2, vigra
 , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
 , fontsConf
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2
+    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
       hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg