02/04: gnu: dkimproxy: Factorise wrapping.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 8c07824c5258588a782d721d8a93b25213d5e658
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Thu Jul 25 23:27:52 2019 +0200

    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.
---
 gnu/packages/mail.scm | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 675ba20..5837db4 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)