diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-02-21 22:28:04 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-21 23:57:20 +0000 |
| commit | 6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec (patch) | |
| tree | a4265a34b8eb6733c990462ce08151412488aa5f /pkgs/tools/networking/curl | |
| parent | 80131f4731a1f845b6c827fe142a6f5e7af01f6a (diff) | |
| download | nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar.gz nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar.bz2 nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar.lz nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar.xz nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.tar.zst nixlib-6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec.zip | |
curl: fixes installation of 7.15
It was trying to install /etc/ssl/cert/ca-certificates.pem See https://hydra.nixos.org/build/32167398/nixlog/1
Diffstat (limited to 'pkgs/tools/networking/curl')
| -rw-r--r-- | pkgs/tools/networking/curl/7.15.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/disable-ca-install.patch | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 1e91d6bd0883..356c9b4f32d2 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -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. diff --git a/pkgs/tools/networking/curl/disable-ca-install.patch b/pkgs/tools/networking/curl/disable-ca-install.patch new file mode 100644 index 000000000000..aedf8ef5c3e2 --- /dev/null +++ b/pkgs/tools/networking/curl/disable-ca-install.patch @@ -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 |