aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@inbox.ru>2017-05-05 22:51:25 +0100
committerLudovic Courtès <ludo@gnu.org>2017-05-30 21:20:19 +0200
commita30188f561af3f84a1da687dffb4192e621929fc (patch)
tree0bb44f6f5658ac7344c7b9a282ee0435a4ba938e
parentee33f9a74264db10bd2e52b6c7bf9e49f0f349d5 (diff)
downloadpatches-a30188f561af3f84a1da687dffb4192e621929fc.tar
patches-a30188f561af3f84a1da687dffb4192e621929fc.tar.gz
gnu: bash-minimal: Override keywords from 'bash'.
'bash-minimal' is a package derived from 'bash' package. 'bash-minimal' is supposed to override keywords from 'bash', but does not do it due to ordering issue. This patch moves #:modules last. Fixes the bootstrap failure reported by rennes and Manolis Ragkousis and tracked down by Andy Wingo in <https://lists.gnu.org/archive/html/guix-devel/2017-05/msg00010.html>. * gnu/packages/bash.scm (bash-minimal)[arguments]: Move #:modules after (package-arguments bash). Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/bash.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index ef22728a92..38aa1786ef 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -211,11 +211,11 @@ without modification.")
(outputs (delete "include" (package-outputs bash)))
(arguments
- (let ((args `(#:modules ((guix build gnu-build-system)
+ (let ((args `(,@(package-arguments bash)
+ #:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1)
- (srfi srfi-26))
- ,@(package-arguments bash))))
+ (srfi srfi-26)))))
(substitute-keyword-arguments args
((#:configure-flags flags)
`(list "--without-bash-malloc"