diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-07-25 23:27:52 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-07-26 01:16:39 +0200 |
| commit | 8c07824c5258588a782d721d8a93b25213d5e658 (patch) | |
| tree | dc5e5e0945f433edd93c45a086084e3fc58a1957 /gnu | |
| parent | d045dce16d319f68fa9209fd1d75a44999edd938 (diff) | |
| download | guix-8c07824c5258588a782d721d8a93b25213d5e658.tar guix-8c07824c5258588a782d721d8a93b25213d5e658.tar.gz | |
gnu: dkimproxy: Factorise wrapping.
This is a follow-up to 66e39000c612a9e16e6db709954582c6c0db8499, 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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/mail.scm | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 675ba20e83..5837db4dde 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1976,26 +1976,29 @@ DKIM and/or DomainKeys.") (modify-phases %standard-phases (add-after 'install 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("PERL5LIB" ":" prefix - (,(string-append (assoc-ref inputs "perl-mail-dkim") - "/lib/perl5/site_perl") - ,(string-append (assoc-ref inputs "perl-mailtools") - "/lib/perl5/site_perl") - ,(string-append - (assoc-ref inputs "perl-mail-authenticationresults") - "/lib/perl5/site_perl") - ,(string-append (assoc-ref inputs "perl-crypt-openssl-rsa") - "/lib/perl5/site_perl") - ,(string-append (assoc-ref inputs "perl-net-dns") - "/lib/perl5/site_perl") - ,(string-append (assoc-ref inputs "perl-net-server") - "/lib/perl5/site_perl"))))) - '("dkimproxy.in" "dkimproxy.out"))) - #t))))) + (let* ((out (assoc-ref outputs "out")) + (wrap.pl (lambda (scripts keys) + (for-each + (lambda (script) + (wrap-program (string-append out script) + `("PERL5LIB" ":" prefix + ,(map (λ (input) + (string-append + (assoc-ref inputs input) + "/lib/perl5/site_perl")) + keys)))) + scripts)))) + (wrap.pl (list "/bin/dkimproxy.in" + "/bin/dkimproxy.out") + (list "perl-crypt-openssl-rsa" + "perl-io-socket-inet6" + "perl-mailtools" + "perl-mail-authenticationresults" + "perl-mail-dkim" + "perl-net-dns" + "perl-net-server" + "perl-socket6")) + #t)))))) (inputs `(("perl" ,perl) ("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa) |