diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-23 11:35:35 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-23 15:48:35 +0100 |
| commit | 82131d50138c9ee00e67c066dab7313aaa51ec6d (patch) | |
| tree | 0e0feec242ecdbd1aaa99c05dad1d2afd2c94d75 | |
| parent | af7df9a37b2ccdb4c3c104a17baf992f929849ba (diff) | |
| download | nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar.gz nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar.bz2 nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar.lz nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar.xz nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.tar.zst nixpkgs-82131d50138c9ee00e67c066dab7313aaa51ec6d.zip | |
clucene_core: switch to versioning scheme to make overriding easier
| -rw-r--r-- | pkgs/applications/misc/bibletime/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/sword/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 689bcf89ef9..cdaeb49f14c 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 3486981463f..bd177ffc660 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/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 { }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58ca8c62d96..a9609334820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |