ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.

Browse source 
* gnu/packages/cmake.scm (cmake-3.15.5)[native-search-paths]: New field.
This commit is contained in:
Ludovic Courtès 2020-01-10 17:23:31 +01:00 committed by Ludovic Courtès
parent 0de28f9ef9
commit 79154f0a09
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/cmake.scm
View file

@ -228,7 +228,21 @@ (define-public cmake-3.15.5
"1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv")) "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))
(patches (patches
(append (search-patches "cmake-curl-certificates.patch") (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". ;; This was cmake@3.15.1 plus "cmake-curl-certificates.patch".
(define-deprecated cmake/fixed cmake-3.15.5) (define-deprecated cmake/fixed cmake-3.15.5)