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

clucene_core: upgrade some packages to clucene_core_2

Browse Source 
on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs.
so perhaps we can soon drop v1?
This commit is contained in:
Mathijs Kwik 2013-06-29 11:49:46 +02:00
parent fe622f6523
commit 6937609391
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -5260,7 +5260,7 @@ let
sofia_sip = callPackage ../development/libraries/sofia-sip { };
soprano = callPackage ../development/libraries/soprano { };
soprano = callPackage ../development/libraries/soprano { clucene_core = clucene_core_2; };
soqt = callPackage ../development/libraries/soqt { };
@ -5314,7 +5314,7 @@ let
stlport = callPackage ../development/libraries/stlport { };
strigi = callPackage ../development/libraries/strigi {};
strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
suil = callPackage ../development/libraries/audio/suil { };
@ -7779,6 +7779,7 @@ let
];
};
poppler = poppler_0_18;
clucene_core = clucene_core_2;
};
liferea = callPackage ../applications/networking/newsreaders/liferea { };