[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)
- 02/12: gnu: Use the two-element 'define-deprecated' form where applicable., (continued)
- 02/12: gnu: Use the two-element 'define-deprecated' form where applicable., guix-commits, 2020/01/11
- 03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch"., guix-commits, 2020/01/11
- 05/12: daemon: Account for deleted store files when deduplication is on., guix-commits, 2020/01/11
- 08/12: gnu: entr: Fix references to external programs., guix-commits, 2020/01/11
- 12/12: doc: Make sure 'htmlxref.cnf' is honored., guix-commits, 2020/01/11
- 01/12: deprecation: Add a two-element form for simple aliases., guix-commits, 2020/01/11
- 07/12: system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2)., guix-commits, 2020/01/11
- 06/12: daemon: Fix the displayed GC estimated progress., guix-commits, 2020/01/11
- 09/12: gnu: timidity++: Add libvorbis as input, guix-commits, 2020/01/11
- 11/12: doc: Update htmlxref.cnf., guix-commits, 2020/01/11
- 04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.,
guix-commits <=
- 10/12: gnu: Add libolm., guix-commits, 2020/01/11