guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/13: gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE.


From: guix-commits
Subject: 07/13: gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
Date: Fri, 13 May 2022 11:52:21 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 2200530bf6850c381f455b3b0d349a9afb2aa2e9
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sat May 7 08:37:32 2022 +0000

    gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
    
    * gnu/packages/tls.scm (openssl)[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/tls.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 84ed0caa5d..e413f3c24f 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -51,6 +51,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system trivial)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
   #:use-module (gnu packages compression)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -495,15 +496,7 @@ OpenSSL for TARGET."
                                                      #$(package-version 
this-package)
                                                      "/misc")))))))
     (native-search-paths
-     (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")))))
+     (list $SSL_CERT_DIR $SSL_CERT_FILE))
     (synopsis "SSL/TLS implementation")
     (description
      "OpenSSL is an implementation of SSL/TLS.")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]