[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation. |
Date: |
Fri, 12 Apr 2019 15:15:51 +0200 |
* 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 <address@hidden>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; 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
- [bug#35244] [PATCH 0/6] Fix some cross-compilation issues., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 6/6] gnu: python: Fix cross compilation., Mathieu Othacehe, 2019/04/12
- [bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation., Mathieu Othacehe, 2019/04/12