diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
| commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
| tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/certs.scm | |
| parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
| parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
| download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/certs.scm')
| -rw-r--r-- | gnu/packages/certs.scm | 9 |
1 files 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))) |