From 5389c5ea57dd17e19412f38dc448b0a5114a3579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Apr 2022 22:58:06 +0200 Subject: [PATCH] gnu: nss-certs: Support cross-compilation. Reported by phodina . * 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 ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2021 Ludovic Courtès +;;; Copyright © 2016-2017, 2021-2022 Ludovic Courtès ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Maxim Cournoyer @@ -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)))