guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: r-curl: Respect CURL_CA_BUNDLE variable.


From: Ricardo Wurmus
Subject: 01/01: gnu: r-curl: Respect CURL_CA_BUNDLE variable.
Date: Fri, 23 Sep 2016 11:14:37 +0000 (UTC)

rekado pushed a commit to branch master
in repository guix.

commit 8f309571d3847d4bca331061e881fa01d9badb77
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Sep 23 13:13:41 2016 +0200

    gnu: r-curl: Respect CURL_CA_BUNDLE variable.
    
    * gnu/packages/web.scm (r-curl)[arguments]: Add phase
    "allow-CURL_CA_BUNDLE".
---
 gnu/packages/web.scm |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 34b7ee3..e632d9c 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3287,6 +3287,20 @@ applications.")
                (base32
                 "04fwasg400v8dvkcn1fcha1jzdz8lbyxi0679q7flsyrp57b3jrf"))))
     (build-system r-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; The environment variable CURL_CA_BUNDLE is only respected when
+         ;; running Windows, so we disable the platform checks.
+         ;; This can be removed once the libcurl has been patched.
+         (add-after 'unpack 'allow-CURL_CA_BUNDLE
+           (lambda _
+             (substitute* "R/onload.R"
+               (("if \\(!grepl\\(\"mingw\".*")
+                "if (FALSE)\n"))
+             (substitute* "src/handle.c"
+               (("#ifdef _WIN32") "#if 1"))
+             #t)))))
     (inputs
      `(("libcurl" ,curl)))
     (home-page "https://github.com/jeroenooms/curl";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]