From d4aaf954011646413e7c2ca39a34030821e84910 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Jan 2016 22:56:01 +0100 Subject: build-system/gnu: Make 'package-with-explicit-inputs' idempotent. * guix/build-system/gnu.scm (package-with-explicit-inputs): Use 'ensure-keyword-arguments' instead of appending to ARGS. * gnu/packages/commencement.scm (static-bash-for-glibc): Add missing #:guile argument. --- guix/build-system/gnu.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'guix/build-system/gnu.scm') diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c83c50b76e..9c53825c4a 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -96,10 +96,11 @@ builder, or the distro's final Guile when GUILE is #f." (package (inherit p) (location (if (pair? loc) (source-properties->location loc) loc)) (arguments - (let ((args (package-arguments p))) - `(#:guile ,guile - #:implicit-inputs? #f - ,@args))) + ;; 'ensure-keyword-arguments' guarantees that this procedure is + ;; idempotent. + (ensure-keyword-arguments (package-arguments p) + `(#:guile ,guile + #:implicit-inputs? #f))) (replacement (let ((replacement (package-replacement p))) (and replacement -- cgit v1.2.3