diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/libraries/sword | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/libraries/sword')
| -rw-r--r-- | pkgs/development/libraries/sword/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index f62bc2eb11daf..f8c5a213ee3b3 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 ./gcc47.patch ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { }; } - |