clucene_core: switch to versioning scheme to make overriding easier

pkgs/applications/misc/bibletime/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
+{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
 
 stdenv.mkDerivation rec {
 
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =  ''
-    export CLUCENE_HOME=${cluceneCore};
+    export CLUCENE_HOME=${clucene_core};
     export SWORD_HOME=${sword};
   '';
 
-  buildInputs = [ cmake sword qt4 boost cluceneCore ];
+  buildInputs = [ cmake sword qt4 boost clucene_core ];
 
   cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
 

pkgs/development/libraries/sword/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}:
+{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg";
   };
 
-  buildInputs = [ pkgconfig icu cluceneCore curl ];
+  buildInputs = [ pkgconfig icu clucene_core curl ];
 
   # because curl/types.h disappeared since at least curl 7.21.7
   patches = [ ./dont_include_curl_types_h.patch ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-

pkgs/top-level/all-packages.nix

@@ -4020,9 +4020,9 @@ let
 
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
 
-  clucene_core = callPackage ../development/libraries/clucene-core { };
+  clucene_core_1 = callPackage ../development/libraries/clucene-core { };
 
-  cluceneCore = clucene_core; # !!! remove this
+  clucene_core = clucene_core_1;
 
   clutter = callPackage ../development/libraries/clutter { };