all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brian Kubisiak <brian@kubisiak.com>
To: 54686@debbugs.gnu.org
Subject: [bug#54686] [PATCH] gnu: nss-certs: Use G-Expression.
Date: Sat, 2 Apr 2022 17:49:15 -0700	[thread overview]
Message-ID: <20220403004915.rzqmwkqkags4adf6@peregrine> (raw)

This fixes cross-compilation for aarch64-linux-gnu.

* gnu/packages/certs.scm (nss-certs)[arguments]: Use a gexp to remove
references to %output.
---
 gnu/packages/certs.scm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index 28c2f84f98..8f762f2966 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -28,6 +28,7 @@ (define-module (gnu packages certs)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
@@ -164,21 +165,21 @@ (define-public nss-certs
                   (rnrs io ports)
                   (srfi srfi-26))
        #:phases
-       (modify-phases
-           (map (cut assq <> %standard-phases)
-                '(set-paths install-locale unpack))
-         (add-after 'unpack 'install
-           (lambda _
-             (let ((certsdir (string-append %output "/etc/ssl/certs/")))
-               (with-directory-excursion "nss/lib/ckfw/builtins/"
-                 (unless (file-exists? "blacklist.txt")
-                   (call-with-output-file "blacklist.txt" (const #t)))
-                 ;; Extract selected single certificates from blob.
-                 (invoke "certdata2pem")
-                 ;; Copy .pem files into the output.
-                 (for-each (cut install-file <> certsdir)
-                           (find-files "." ".*\\.pem$")))
-               (invoke "openssl" "rehash" certsdir)))))))
+       ,#~(modify-phases
+              (map (cut assq <> %standard-phases)
+                   '(set-paths install-locale unpack))
+            (add-after 'unpack 'install
+              (lambda _
+                (let ((certsdir (string-append #$output "/etc/ssl/certs/")))
+                  (with-directory-excursion "nss/lib/ckfw/builtins/"
+                    (unless (file-exists? "blacklist.txt")
+                      (call-with-output-file "blacklist.txt" (const #t)))
+                    ;; Extract selected single certificates from blob.
+                    (invoke "certdata2pem")
+                    ;; Copy .pem files into the output.
+                    (for-each (cut install-file <> certsdir)
+                              (find-files "." ".*\\.pem$")))
+                  (invoke "openssl" "rehash" certsdir)))))))
     (synopsis "CA certificates from Mozilla")
     (description
      "This package provides certificates for Certification Authorities (CA)
-- 
2.34.0






             reply	other threads:[~2022-04-03  0:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-03  0:49 Brian Kubisiak [this message]
2022-05-02 20:24 ` bug#54686: [PATCH] gnu: nss-certs: Use G-Expression Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220403004915.rzqmwkqkags4adf6@peregrine \
    --to=brian@kubisiak.com \
    --cc=54686@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.