guix-commits
[Top][All Lists]
Advanced

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

11/13: gnu: guix: Use $SSL_CERT_DIR.


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

civodul pushed a commit to branch master
in repository guix.

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

    gnu: guix: Use $SSL_CERT_DIR.
    
    * gnu/packages/package-management.scm (guix)[native-search-paths]: Use the
    $SSL_CERT_DIR from (guix search-paths) instead of a
    local copy.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/package-management.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 10b0e010de..908efee821 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -121,6 +121,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
@@ -473,14 +474,9 @@ $(prefix)/etc/openrc\n")))
        (list (search-path-specification
               (variable "GUIX_EXTENSIONS_PATH")
               (files '("share/guix/extensions")))
-
              ;; (guix git) and (guix build download) honor this variable whose
              ;; name comes from OpenSSL.
-             (search-path-specification
-              (variable "SSL_CERT_DIR")
-              (separator #f)                      ;single entry
-              (files '("etc/ssl/certs")))))
-
+             $SSL_CERT_DIR))
       (home-page "https://www.gnu.org/software/guix/";)
       (synopsis "Functional package manager for installed software packages 
and versions")
       (description



reply via email to

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