guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: bash-completion: Fix cross-compilation.


From: guix-commits
Subject: 01/01: gnu: bash-completion: Fix cross-compilation.
Date: Tue, 25 Jun 2019 15:35:32 -0400 (EDT)

mothacehe pushed a commit to branch master
in repository guix.

commit d8dbfbce60a6df9cf87ede8c0454f1b2214e80a7
Author: Mathieu Othacehe <address@hidden>
Date:   Wed Mar 6 10:24:15 2019 +0100

    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.
---
 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 fb4e3f4..ef93a11 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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]