me
/
guix
Archived
1
0
Fork 0
Code

gnu: dkimproxy: Factorise wrapping. 

This is a follow-up to 66e39000c6, in a
way, since it adds the forgotten *6 inputs.

* gnu/packages/mail.scm (dkimproxy)[arguments]: Refactor ’make-wrapper’ phase.
Add perl-io-socket-inet6 and perl-socket6 to the list.
master
Tobias Geerinckx-Rice 2019-07-25 23:27:52 +02:00
parent d045dce16d
commit 8c07824c52
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/mail.scm
View File

@ -1976,26 +1976,29 @@ DKIM and/or DomainKeys.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'make-wrapper (add-after 'install 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out"))
(wrap.pl (lambda (scripts keys)
(for-each (for-each
(lambda (prog) (lambda (script)
(wrap-program (string-append out "/bin/" prog) (wrap-program (string-append out script)
`("PERL5LIB" ":" prefix `("PERL5LIB" ":" prefix
(,(string-append (assoc-ref inputs "perl-mail-dkim") ,(map (λ (input)
"/lib/perl5/site_perl") (string-append
,(string-append (assoc-ref inputs "perl-mailtools") (assoc-ref inputs input)
"/lib/perl5/site_perl") "/lib/perl5/site_perl"))
,(string-append keys))))
(assoc-ref inputs "perl-mail-authenticationresults") scripts))))
"/lib/perl5/site_perl") (wrap.pl (list "/bin/dkimproxy.in"
,(string-append (assoc-ref inputs "perl-crypt-openssl-rsa") "/bin/dkimproxy.out")
"/lib/perl5/site_perl") (list "perl-crypt-openssl-rsa"
,(string-append (assoc-ref inputs "perl-net-dns") "perl-io-socket-inet6"
"/lib/perl5/site_perl") "perl-mailtools"
,(string-append (assoc-ref inputs "perl-net-server") "perl-mail-authenticationresults"
"/lib/perl5/site_perl"))))) "perl-mail-dkim"
'("dkimproxy.in" "dkimproxy.out"))) "perl-net-dns"
#t))))) "perl-net-server"
"perl-socket6"))
#t))))))
(inputs (inputs
`(("perl" ,perl) `(("perl" ,perl)
("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa) ("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa)