ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nss-certs: Support cross-compilation.

Browse source 
Reported by phodina <phodina@protonmail.com>.

* gnu/packages/certs.scm (nss-certs)[arguments]: In 'install' phase, do
not refer to '%output' when cross-compiling.
This commit is contained in:
Ludovic Courtès 2022-04-18 22:58:06 +02:00
parent 902099a8c0
commit 5389c5ea57
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/certs.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; 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 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -169,7 +169,12 @@ (define-public nss-certs
'(set-paths install-locale unpack)) '(set-paths install-locale unpack))
(add-after 'unpack 'install (add-after 'unpack 'install
(lambda _ (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/" (with-directory-excursion "nss/lib/ckfw/builtins/"
(unless (file-exists? "blacklist.txt") (unless (file-exists? "blacklist.txt")
(call-with-output-file "blacklist.txt" (const #t))) (call-with-output-file "blacklist.txt" (const #t)))