ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nss-certs: Update phase style.

Browse source 
* gnu/packages/certs.scm (nss-certs)[arguments]: Use MODIFY-PHASES
syntax, substitute INVOKE for SYSTEM*, and end phas with #t.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-20 03:27:54 +01:00
parent 280b62b074
commit 3c747a080f
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/certs.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -102,8 +102,10 @@ (define-public nss-certs
(srfi srfi-26) (srfi srfi-26)
(ice-9 regex)) (ice-9 regex))
#:phases #:phases
(alist-cons-after (modify-phases
'unpack 'install (map (cut assq <> %standard-phases)
'(set-paths install-locale unpack))
(add-after 'unpack 'install
(lambda _ (lambda _
(let ((certsdir (string-append %output "/etc/ssl/certs/")) (let ((certsdir (string-append %output "/etc/ssl/certs/"))
(trusted-rx (make-regexp "^# openssl-trust=[a-zA-Z]" (trusted-rx (make-regexp "^# openssl-trust=[a-zA-Z]"
@ -131,10 +133,9 @@ (define (maybe-install-cert file)
;; "Usage error; try -help." ;; "Usage error; try -help."
;; This looks like a bug in openssl-1.0.2, but we can also ;; This looks like a bug in openssl-1.0.2, but we can also
;; switch into the target directory. ;; switch into the target directory.
(system* "c_rehash" ".")))) (invoke "c_rehash" "."))
#t))))))
(map (cut assq <> %standard-phases)
'(set-paths install-locale unpack)))))
(synopsis "CA certificates from Mozilla") (synopsis "CA certificates from Mozilla")
(description (description
"This package provides certificates for Certification Authorities (CA) "This package provides certificates for Certification Authorities (CA)