[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/14: gnu: nss-certs: Support cross-compilation.
From: |
guix-commits |
Subject: |
02/14: gnu: nss-certs: Support cross-compilation. |
Date: |
Mon, 18 Apr 2022 17:27:36 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5389c5ea57dd17e19412f38dc448b0a5114a3579
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Apr 18 22:58:06 2022 +0200
gnu: nss-certs: Support cross-compilation.
Reported by phodina <phodina@protonmail.com>.
* gnu/packages/certs.scm (nss-certs)[arguments]: In 'install' phase, do
not refer to '%output' when cross-compiling.
---
gnu/packages/certs.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index 28c2f84f98..d410b05860 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2017, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016-2017, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -169,7 +169,12 @@ that was originally contributed to Debian.")
'(set-paths install-locale unpack))
(add-after 'unpack 'install
(lambda _
- (let ((certsdir (string-append %output "/etc/ssl/certs/")))
+ ;; TODO: On the next rebuild cycle, remove references to
+ ;; '%output' and '%outputs'.
+ (let ((certsdir (string-append ,(if (%current-target-system)
+ '(assoc-ref %outputs "out")
+ '%output)
+ "/etc/ssl/certs/")))
(with-directory-excursion "nss/lib/ckfw/builtins/"
(unless (file-exists? "blacklist.txt")
(call-with-output-file "blacklist.txt" (const #t)))
- branch master updated (237d90a780 -> 6b677f4299), guix-commits, 2022/04/18
- 03/14: gnu: python-jmespath: Update to 1.0.0., guix-commits, 2022/04/18
- 05/14: gnu: Remove python-botocore-for-awscli., guix-commits, 2022/04/18
- 08/14: gnu: mousepad: Update to 0.5.9., guix-commits, 2022/04/18
- 07/14: gnu: orage: Update to 4.16.0., guix-commits, 2022/04/18
- 04/14: gnu: awscli: Update to 1.22.90., guix-commits, 2022/04/18
- 02/14: gnu: nss-certs: Support cross-compilation.,
guix-commits <=
- 06/14: gnu: Remove python-pyyaml-for-awscli., guix-commits, 2022/04/18
- 10/14: gnu: Add python-quart., guix-commits, 2022/04/18
- 13/14: gnu: emacs-chess: Fix path to pieces., guix-commits, 2022/04/18
- 01/14: gnu: ntp: Support cross-compilation., guix-commits, 2022/04/18
- 14/14: services: ipfs: Adjust for Shepherd 0.9., guix-commits, 2022/04/18
- 09/14: gnu: janet: Update to 1.21.1., guix-commits, 2022/04/18
- 11/14: gnu: Add python-ajsonrpc., guix-commits, 2022/04/18
- 12/14: gnu: Add python-sre-yield., guix-commits, 2022/04/18