diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
| commit | 3cfe76bec06fbd8bb7e7cb3387866fefbcad674f (patch) | |
| tree | b66780d205fb50fd44d0bbb38f5df99cf3167ba1 /gnu/packages/cmake.scm | |
| parent | ec836b46bf52a5f86c61f50e3a2c3330a7ee3665 (diff) | |
| parent | 574a71a7a9668aa184661c58e1f18a4d4fccd792 (diff) | |
| download | patches-3cfe76bec06fbd8bb7e7cb3387866fefbcad674f.tar patches-3cfe76bec06fbd8bb7e7cb3387866fefbcad674f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 556e98afc1..e24b6dea7d 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -31,6 +31,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix deprecation) #:use-module (guix build-system gnu) #:use-module (guix build-system emacs) #:use-module (gnu packages) @@ -163,7 +164,18 @@ (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") - (files '(""))))) + (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"))))) (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description |