diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-17 15:31:04 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-17 19:32:43 +0200 |
| commit | 7488d70c555e9ecb9e41fad1b3cfd1234edbaa9d (patch) | |
| tree | 8e70d4ebd86cbbf043f1d4065cd72bc5411e02e4 | |
| parent | dabbddbbaae23ab512495c5505d99fa112a4b09e (diff) | |
| download | guix-7488d70c555e9ecb9e41fad1b3cfd1234edbaa9d.tar.gz | |
build-system/gnu: Simplify 'dist-package'.
* guix/build-system/gnu.scm (dist-package): Use default keyword arguments in 'substitute-keyword-arguments'.
| -rw-r--r-- | guix/build-system/gnu.scm | 22 |
1 files 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) |