pyrox.dev
Merge pull request #13357 from zimbatm/curl-7.15-fixup
curl: fixes installation of 7.15
+2
pkgs/tools/networking/curl/7.15.nix
+2
pkgs/tools/networking/curl/7.15.nix
···
20
sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3";
21
};
22
23
+
patches = [ ./disable-ca-install.patch ];
24
+
25
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
26
# "-lz -lssl", which aren't necessary direct build inputs of
27
# applications that use Curl.
+14
pkgs/tools/networking/curl/disable-ca-install.patch
+14
pkgs/tools/networking/curl/disable-ca-install.patch
···
···
1
+
--- a/lib/Makefile.in
2
+
+++ b/lib/Makefile.in
3
+
@@ -106,10 +106,7 @@ else
4
+
endif
5
+
6
+
install-data-hook:
7
+
- @if test -n "@CURL_CA_BUNDLE@"; then \
8
+
- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
9
+
- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
10
+
- fi
11
+
+ echo "install-data-hook disabled"
12
+
13
+
# this hook is mainly for non-unix systems to build even if configure
14
+
# isn't run