From 6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 21 Feb 2016 22:28:04 +0000 Subject: [PATCH] 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 --- pkgs/tools/networking/curl/7.15.nix | 2 ++ .../tools/networking/curl/disable-ca-install.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/networking/curl/disable-ca-install.patch diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 1e91d6bd088..356c9b4f32d 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 00000000000..aedf8ef5c3e --- /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