From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 35244@debbugs.gnu.org
Cc: Mathieu Othacehe <m.othacehe@gmail.com>
Subject: [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation.
Date: Fri, 12 Apr 2019 15:15:51 +0200 [thread overview]
Message-ID: <20190412131556.25282-1-m.othacehe@gmail.com> (raw)
In-Reply-To: <20190412131331.24892-1-m.othacehe@gmail.com>
* gnu/packages/bash.scm (bash-completion)[arguments]: Search for util-linux in
native-inputs and inputs during "remove-redundant-completions" phase.
---
gnu/packages/bash.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index fb4e3f4be3..ef93a11085 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -291,13 +292,16 @@ without modification.")
`(#:phases (modify-phases %standard-phases
(add-after
'install 'remove-redundant-completions
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key
+ inputs native-inputs
+ outputs #:allow-other-keys)
;; Util-linux comes with a bunch of completion files for
;; its own commands which are more sophisticated and
;; up-to-date than those of bash-completion. Remove those
;; from bash-completion.
(let* ((out (assoc-ref outputs "out"))
- (util-linux (assoc-ref inputs "util-linux"))
+ (util-linux (assoc-ref (or native-inputs inputs)
+ "util-linux"))
(completions (string-append out
"/share/bash-completion"
"/completions"))
--
2.17.1
next prev parent reply other threads:[~2019-04-12 13:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 13:13 [bug#35244] [PATCH 0/6] Fix some cross-compilation issues Mathieu Othacehe
2019-04-12 13:15 ` Mathieu Othacehe [this message]
2019-04-12 13:15 ` [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation Mathieu Othacehe
2019-04-14 15:22 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package Mathieu Othacehe
2019-04-14 15:24 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation Mathieu Othacehe
2019-04-14 15:26 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 5/6] linux-initrd: " Mathieu Othacehe
2019-04-14 15:29 ` Ludovic Courtès
2019-06-25 19:47 ` Mathieu Othacehe
2019-06-26 8:57 ` Ludovic Courtès
2019-04-12 13:15 ` [bug#35244] [PATCH 6/6] gnu: python: " Mathieu Othacehe
2019-04-14 15:27 ` Ludovic Courtès
2019-04-14 15:19 ` [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation Ludovic Courtès
2019-06-25 19:42 ` Mathieu Othacehe
2019-06-26 8:19 ` [bug#35244] [PATCH] gnu: perl: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412131556.25282-1-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=35244@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).