Subject: [PATCH 1/2] gnu: nvi: Refactor.
From: Herman Rimm <[email-masked]>
To: [email-masked]
Date: Thu, 12 Dec 2024 21:27:07 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/nvi.scm (nvi)[arguments]: Use G-exps.  Replace
config.guess.

Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb
---
 gnu/packages/nvi.scm | 52 ++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm
index f1f461f2b4..bb23aa790a 100644
--- a/gnu/packages/nvi.scm
+++ b/gnu/packages/nvi.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Marek Benc <[email-masked]>
 ;;; Copyright © 2020 Marius Bakke <[email-masked]>
+;;; Copyright © 2024 Herman Rimm <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,7 @@ (define-module (gnu packages nvi)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (guix utils))
 
@@ -65,30 +67,32 @@ (define-public nvi
 
     (build-system gnu-build-system)
     (arguments
-      `(#:out-of-source? #t
-        #:configure-flags
-        '("--enable-widechar"
-          ,@(if (%current-target-system)
-                '("vi_cv_sprintf_count=yes")
-                '()))
-        #:phases
-        (modify-phases %standard-phases
-          (add-before 'configure 'fix-configure
-            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-              ;; Replace outdated config.sub and config.guess:
-              (with-directory-excursion "dist"
-                (for-each (lambda (file)
-                            (chmod file #o755)
-                            (install-file
-                             (string-append
-                              (assoc-ref
-                               (or native-inputs inputs) "automake")
-                              "/share/automake-"
-                              ,(version-major+minor
-                                (package-version automake))
-                              "/" file) "."))
-                          '("config.sub")))
-              #t)))))
+     (list
+       #:out-of-source? #t
+       #:configure-flags
+       #~'("--enable-widechar"
+           #$@(if (%current-target-system)
+                  '("vi_cv_sprintf_count=yes")
+                  '()))
+       #:phases
+       #~(modify-phases %standard-phases
+           (add-before 'configure 'fix-configure
+             (lambda* (#:key inputs native-inputs #:allow-other-keys)
+               ;; Replace outdated config.sub and config.guess:
+               (with-directory-excursion "dist"
+                 (for-each
+                   (lambda (file)
+                     (chmod file #o755)
+                     (install-file
+                       (format #f "~a/share/automake-~a/~a"
+                               (assoc-ref (or native-inputs inputs)
+                                          "automake")
+                               #$(version-major+minor
+                                   (package-version automake))
+                               file)
+                       "."))
+                   '("config.sub" "config.guess")))
+               #t)))))
     (inputs
       (list bdb ncurses))
     (native-inputs

base-commit: a9003b8e6b40b59c9545ae87bb441d3549630db7
-- 
2.45.2