diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 06bd5823e87..a3684194c0f 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig icu cluceneCore curl ]; + # because curl/types.h disappeared since at least curl 7.21.7 + patches = [ ./dont_include_curl_types_h.patch ]; + prePatch = '' patchShebangs .; ''; diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch new file mode 100644 index 00000000000..233d59a3243 --- /dev/null +++ b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch @@ -0,0 +1,24 @@ +diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp +index 7d2fd3c..046291e 100644 +--- a/src/mgr/curlftpt.cpp ++++ b/src/mgr/curlftpt.cpp +@@ -26,7 +26,6 @@ + #include + + #include +-#include + #include + + #include +diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp +index b736050..229d4dd 100644 +--- a/src/mgr/curlhttpt.cpp ++++ b/src/mgr/curlhttpt.cpp +@@ -25,7 +25,6 @@ + #include + + #include +-#include + #include + + #include