[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/13: gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
From: |
guix-commits |
Subject: |
09/13: gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE. |
Date: |
Fri, 13 May 2022 11:52:22 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 579270c6bf1ec5662efc1e166f3a430b59edf3c9
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sat May 7 08:37:34 2022 +0000
gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
* gnu/packages/cmake.scm (cmake-bootstrap)[native-search-paths]: Use the
$SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local
copy.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/cmake.scm | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 4207f14310..cf930c57fc 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -38,6 +38,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
+ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
#:use-module (gnu packages)
#:use-module (gnu packages backup)
#:use-module (gnu packages compression)
@@ -229,15 +230,8 @@ using the CMake build system.")
(files '("")))
;; "cmake-curl-certificates.patch" changes CMake to honor
'SSL_CERT_DIR'
;; and 'SSL_CERT_FILE', hence these search path entries.
- (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")))))
+ $SSL_CERT_DIR
+ $SSL_CERT_FILE))
(home-page "https://cmake.org/")
(synopsis "Cross-platform build system")
(description
- 04/13: gnu: artanis: Remove input labels., (continued)
- 04/13: gnu: artanis: Remove input labels., guix-commits, 2022/05/13
- 02/13: gnu: guile-ics: Update to 0.2.1, guix-commits, 2022/05/13
- 07/13: gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE., guix-commits, 2022/05/13
- 12/13: gnu: poke: Update to 2.3., guix-commits, 2022/05/13
- 13/13: gnu: xonsh: Update to 0.12.4., guix-commits, 2022/05/13
- 06/13: search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE., guix-commits, 2022/05/13
- 08/13: gnu: cuirass: Use $SSL_CERT_DIR., guix-commits, 2022/05/13
- 05/13: gnu: pipe-viewer: Update to 0.2.0, guix-commits, 2022/05/13
- 03/13: gnu: artanis: Update to 0.5.1., guix-commits, 2022/05/13
- 10/13: gnu: curl: Use $SSL_CERT_DIR/$SSL_CERT_FILE., guix-commits, 2022/05/13
- 09/13: gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.,
guix-commits <=
- 11/13: gnu: guix: Use $SSL_CERT_DIR., guix-commits, 2022/05/13