From 73c738bc9e5374a1dc38237dfc067fa2c320d5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 23 Feb 2023 14:32:51 +0100
Subject: [PATCH] gnu: infiniband-diags: Use gexps.

* gnu/packages/fabric-management.scm (infiniband-diags)[arguments]: Use
gexps.  Replace reference to '%outputs' with references to #:outputs.
---
 gnu/packages/fabric-management.scm | 46 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 1ed65df0c1..09e4a2b854 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -109,28 +109,30 @@ (define-public infiniband-diags
      ;; FIXME: needs rst2man for man pages
      (list perl pkg-config))
     (arguments
-     '(#:configure-flags
-       (list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "opensm")
-                            "/include/infiniband")
-             (string-append "--with-perl-installdir=" (assoc-ref %outputs "lib")
-                            "/lib/perl5/vendor_perl")
-             "--disable-static")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'licence
-           (lambda _
-             (let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc")))
-               (mkdir-p doc)
-               (install-file "COPYING" doc))))
-         (add-after 'install-file 'move-perl
-           ;; Avoid perl in lib closure
-           (lambda _
-             (let ((perlout (string-append (assoc-ref %outputs "out") "/lib"))
-                   (perlin (string-append (assoc-ref %outputs "lib")
-                                          "/lib/perl5")))
-               (mkdir-p perlout)
-               (rename-file perlin perlout)
-               #t))))))
+     (list #:configure-flags
+           #~(list (string-append "CPPFLAGS=-I"
+                                  #$(this-package-input "opensm")
+                                  "/include/infiniband")
+                   (string-append "--with-perl-installdir=" #$output:lib
+                                  "/lib/perl5/vendor_perl")
+                   "--disable-static")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'licence
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((doc (string-append (assoc-ref outputs "lib")
+                                             "/share/doc")))
+                     (mkdir-p doc)
+                     (install-file "COPYING" doc))))
+               (add-after 'install-file 'move-perl
+                 ;; Avoid perl in lib closure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((perlout (string-append (assoc-ref outputs "out")
+                                                 "/lib"))
+                         (perlin (string-append (assoc-ref outputs "lib")
+                                                "/lib/perl5")))
+                     (mkdir-p perlout)
+                     (rename-file perlin perlout)))))))
     (home-page "https://github.com/linux-rdma/infiniband-diags")
     (synopsis "Infiniband diagnostic tools")
     (description "This is a set of command-line utilities to help configure,