From 401086dbc796ac4ba08f49b7328602edabdc6492 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 8 May 2024 10:44:28 -0400
Subject: gnu: libbpf: Use gexps.

* gnu/packages/linux.scm (libbpf) [arguments]: Use gexps.

Change-Id: I5529cda3b316a24b48f4a33bfd685695614350bb
---
 gnu/packages/linux.scm | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c555ebdb47..fc1127f319 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9833,31 +9833,27 @@ (define-public libbpf
         (base32
          "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config))
-    (propagated-inputs
-     ;; In Requires.private of libbpf.pc.
-     (list elfutils zlib))
     (arguments
-     `(#:tests? #f                      ; no tests
-       #:make-flags
-       (list
-        (string-append "PREFIX=" (assoc-ref %outputs "out"))
-        (string-append "LIBDIR=$(PREFIX)/lib")
-        (string-append "CC=" ,(cc-for-target)))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-before 'build 'pre-build
-           (lambda _
-             (chdir "src"))))))
+     (list
+      #:tests? #f                       ;self-tests run in QEMU
+      #:make-flags
+      #~(list (string-append "PREFIX=" #$output)
+              (string-append "LIBDIR=$(PREFIX)/lib")
+              (string-append "CC=" #$(cc-for-target)))
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure)
+                   (add-before 'build 'pre-build
+                     (lambda _
+                       (chdir "src"))))))
+    (native-inputs (list pkg-config))
+    (propagated-inputs (list elfutils zlib)) ;in Requires.private of libbpf.pc
     (home-page "https://github.com/libbpf/libbpf")
     (synopsis "BPF CO-RE (Compile Once – Run Everywhere)")
     (description
      "Libbpf supports building BPF CO-RE-enabled applications, which, in
 contrast to BCC, do not require the Clang/LLVM runtime or linux kernel
 headers.")
-    (license `(,license:lgpl2.1 ,license:bsd-2))))
+    (license (list license:lgpl2.1 license:bsd-2))))
 
 (define-public bcc
   (package
-- 
cgit v1.2.3