guix-commits
[Top][All Lists]
Advanced

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

04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.


From: guix-commits
Subject: 04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.
Date: Sat, 11 Jan 2020 18:22:39 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 79154f0a09ad748839f88120ddd61a0e1e147b5e
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Fri Jan 10 17:23:31 2020 +0100

    gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.
    
    * gnu/packages/cmake.scm (cmake-3.15.5)[native-search-paths]: New field.
---
 gnu/packages/cmake.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index de49f52..2d2827f 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -228,7 +228,21 @@ and workspaces that can be used in the compiler 
environment of your choice.")
                 "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))
               (patches
                (append (search-patches "cmake-curl-certificates.patch")
-                       (origin-patches (package-source cmake))))))))
+                       (origin-patches (package-source cmake))))))
+
+    (native-search-paths
+     ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR'
+     ;; and 'SSL_CERT_FILE', hence these search path entries.
+     (append (list (search-path-specification
+                    (variable "SSL_CERT_DIR")
+                    (separator #f)                ;single entry
+                    (files '("etc/ssl/certs")))
+                   (search-path-specification
+                    (variable "SSL_CERT_FILE")
+                    (file-type 'regular)
+                    (separator #f)                ;single entry
+                    (files '("etc/ssl/certs/ca-certificates.crt"))))
+             (package-native-search-paths cmake)))))
 
 ;; This was cmake@3.15.1 plus "cmake-curl-certificates.patch".
 (define-deprecated cmake/fixed cmake-3.15.5)



reply via email to

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