nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: bash-completion: Fix cross-compilation. 

* gnu/packages/bash.scm (bash-completion)[arguments]: Search for util-linux in
native-inputs and inputs during "remove-redundant-completions" phase.
This commit is contained in:
Mathieu Othacehe 2019-03-06 10:24:15 +01:00
parent 6c6a049b13
commit d8dbfbce60
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/bash.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -291,13 +292,16 @@ without modification.")
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after (add-after
'install 'remove-redundant-completions '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 ;; Util-linux comes with a bunch of completion files for
;; its own commands which are more sophisticated and ;; its own commands which are more sophisticated and
;; up-to-date than those of bash-completion. Remove those ;; up-to-date than those of bash-completion. Remove those
;; from bash-completion. ;; from bash-completion.
(let* ((out (assoc-ref outputs "out")) (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 (completions (string-append out
"/share/bash-completion" "/share/bash-completion"
"/completions")) "/completions"))