From c235957534cf2f42e38c876318a64b5c784ebd8b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 18 Aug 2023 00:38:13 -0400
Subject: [PATCH] gnu: libnatpmp: Use gexps and simplify.

* gnu/packages/networking.scm (libnatpmp) [arguments]: Use gexps.  Use gexp
variables and cc-for-target in make flags.
---
 gnu/packages/networking.scm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index cc6f1a1e048..938e27fd791 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1427,19 +1427,13 @@ files contain direct mappings of the abstractions provided by the ØMQ C API.")
                 "0w7wvf4yi8qv659dg9d3ndqvh3bqhgm21gd135spwhq6hhnfv106"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (delete 'check)) ; no tests
-       #:make-flags
-       (let* ((target ,(%current-target-system))
-              (gcc (if target
-                       (string-append target "-gcc")
-                       "gcc")))
-         (list
-          (string-append "CC=" gcc)
-          (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
-          (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (delete 'configure)
+                        (delete 'check)) ; no tests
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "INSTALLPREFIX=" #$output)
+                   (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))))
     (home-page "http://miniupnp.free.fr/libnatpmp.html")
     (synopsis "C library implementing NAT-PMP")
     (description