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

clucene_core: switch to versioning scheme to make overriding easier

Browse Source
This commit is contained in:
Mathijs Kwik 2013-12-23 11:35:35 +01:00
parent af7df9a37b
commit 82131d5013
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/bibletime/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}: {stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
''; '';
preConfigure = '' preConfigure = ''
export CLUCENE_HOME=${cluceneCore}; export CLUCENE_HOME=${clucene_core};
export SWORD_HOME=${sword}; 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"; cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";

5
pkgs/development/libraries/sword/default.nix
View File

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

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

@ -4020,9 +4020,9 @@ let
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; 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 { }; clutter = callPackage ../development/libraries/clutter { };