me/guix
Archived
1
0
Fork 0
Code Activity

gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.

Browse source 
* 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>
This commit is contained in:
Maxime Devos 2022-05-07 08:37:34 +00:00 • committed by Ludovic Courtès
parent 39420f27ee
commit 579270c6bf
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/cmake.scm
View file

@ -38,6 +38,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system emacs) #: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)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -229,15 +230,8 @@ using the CMake build system.")
(files '(""))) (files '("")))
;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR' ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR'
;; and 'SSL_CERT_FILE', hence these search path entries. ;; and 'SSL_CERT_FILE', hence these search path entries.
(search-path-specification $SSL_CERT_DIR
(variable "SSL_CERT_DIR") $SSL_CERT_FILE))
(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")))))
(home-page "https://cmake.org/") (home-page "https://cmake.org/")
(synopsis "Cross-platform build system") (synopsis "Cross-platform build system")
(description (description