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

Merge master into stdenv-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2013-12-28 23:28:30 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {
@@ -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 {
};
}