mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
Merge pull request #13357 from zimbatm/curl-7.15-fixup
curl: fixes installation of 7.15
This commit is contained in:
commit
60290c69e4
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3";
|
||||
};
|
||||
|
||||
patches = [ ./disable-ca-install.patch ];
|
||||
|
||||
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
|
||||
# "-lz -lssl", which aren't necessary direct build inputs of
|
||||
# applications that use Curl.
|
||||
|
14
pkgs/tools/networking/curl/disable-ca-install.patch
Normal file
14
pkgs/tools/networking/curl/disable-ca-install.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- a/lib/Makefile.in
|
||||
+++ b/lib/Makefile.in
|
||||
@@ -106,10 +106,7 @@ else
|
||||
endif
|
||||
|
||||
install-data-hook:
|
||||
- @if test -n "@CURL_CA_BUNDLE@"; then \
|
||||
- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
|
||||
- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
|
||||
- fi
|
||||
+ echo "install-data-hook disabled"
|
||||
|
||||
# this hook is mainly for non-unix systems to build even if configure
|
||||
# isn't run
|
Loading…
Reference in New Issue
Block a user