From 7488d70c555e9ecb9e41fad1b3cfd1234edbaa9d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 17 Jun 2020 15:31:04 +0200
Subject: build-system/gnu: Simplify 'dist-package'.

* guix/build-system/gnu.scm (dist-package): Use default keyword
arguments in 'substitute-keyword-arguments'.
---
 guix/build-system/gnu.scm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 1085c62d7f..60851c5897 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -235,19 +235,15 @@ exact build phases are defined by PHASES."
       (source s)
       (arguments
        ;; Use the right phases and modules.
-       (let* ((args (default-keyword-arguments (package-arguments p)
-                      `(#:phases #f
-                        #:modules ,%default-modules
-                        #:imported-modules ,%gnu-build-system-modules))))
-         (substitute-keyword-arguments args
-           ((#:modules modules)
-            `((guix build gnu-dist)
-              ,@modules))
-           ((#:imported-modules modules)
-            `((guix build gnu-dist)
-              ,@modules))
-           ((#:phases _)
-            phases))))
+       (substitute-keyword-arguments (package-arguments p)
+         ((#:modules modules %default-modules)
+          `((guix build gnu-dist)
+            ,@modules))
+         ((#:imported-modules modules %gnu-build-system-modules)
+          `((guix build gnu-dist)
+            ,@modules))
+         ((#:phases _ #f)
+          phases)))
       (native-inputs
        ;; Add autotools & co. as inputs.
        (let ((ref (lambda (module var)
-- 
cgit v1.2.3

' action='/guix/log/gnu/packages/nutrition.scm'>
<input type='hidden' name='id' value='022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584'>root</a>/<a href='/guix/log/gnu?id=022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584'>gnu</a>/<a href='/guix/log/gnu/packages?id=022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584'>packages</a>/<a href='/guix/log/gnu/packages/nutrition.scm?id=022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584'>nutrition.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/nutrition.scm?id=022d90cd9e1ac145fddb7fe81c8d5f6cf11c4584&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>