From patchwork Fri Apr 12 13:15:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3272 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D30116E5B; Fri, 12 Apr 2019 14:25:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DF00F16E5C for ; Fri, 12 Apr 2019 14:25:10 +0100 (BST) Received: from localhost ([127.0.0.1]:37256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwB3-0004Pi-KI for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000204-IB for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-000559-0q for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3D-0004zt-Md for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3B-0003M5-Oa for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation. References: <20190412131331.24892-1-m.othacehe@gmail.com> In-Reply-To: <20190412131331.24892-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507497512773 (code B ref 35244); Fri, 12 Apr 2019 13:17:01 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:15 +0000 Received: from localhost ([127.0.0.1]:55623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2Q-0003Jw-E7 for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:14 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:50422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2J-0003J1-QK for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:12 -0400 Received: by mail-wm1-f53.google.com with SMTP id z11so11263829wmi.0 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=whYJFem/ce1KVAfvvGHSVyiIN28uIrNft6GaPHPx9gg=; b=N4NkIfodES+aQGA1mgUuYmFfvHwyuh2CUZaTjZNywJFnG+kScFDTpZf4flkOYCvMAD KGeZY0zUxMf0C42ov5/nBTZl4Nf2U4gGrwem8Uxa0WLWGH15zRUP29s0bVwyOUWN331I /m0dNBLuOUsnbx95Uy9n7QhW1GrhsgBAJxaKvdmC/bNfcj10V2UKK1RMoZxOIHe3PseC IIoyZ1d8tiQ9jx8ii6csL3iJ0iGxmd+zqlC7rswsE9mhCqrdK8VBQZxdCBNy4pIeIP0M lj8WcJJeqlrf/3/KwnpC8ScjCztVCPG1f0BhgBiO+Y/Lnk1yVMGthhU2pk3+Sp8jPF+T z70g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=whYJFem/ce1KVAfvvGHSVyiIN28uIrNft6GaPHPx9gg=; b=QdtGYc7bE7/el2NUc1SnFHHZ7sQC5g+24P6ymHcOUzA2m74NhsAdTgLFdMHLs0p9yM Ds1VHiEWdBNrPlUv0UN83PwTIoJ5dv5C9z1+TxlsLjYF3wK3ojPAT+acC/cOxTF/2Dfn za1SqM14oAk8mSICiqYcxjvBFmZQ0Ww4Kf+egxe5AZUjWD2rkcv01gWtZVyLBBkU1pTD bYSaxC+f/lEiP8ODt7gUS8mDWAu5ig2BPxXIpV9XiLo2GkzjEQPQLMddrBAyLCpoHZTP 0+s6RFYt+mrxR65NpwuGMY9UaNNSuwP5b1n+3Xl2dDflmWlec6uEg486OEJpt+R7G7VE 4MaQ== X-Gm-Message-State: APjAAAVIobNac+jb3WGVmksD8yZGuCZz/MPx9DP2N1Bj0Kak8ObTbJqi /rH0ow2haMLOAI9myJ/ges6iSfvV X-Google-Smtp-Source: APXvYqzqBHZ9xigo7g9sN083V6VEmaZK+C/cln9Qi5raUGpyCYlrWKkBxf0SLMJX58EernDvc44Fcw== X-Received: by 2002:a1c:6c17:: with SMTP id h23mr605300wmc.122.1555074961767; Fri, 12 Apr 2019 06:16:01 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:01 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:51 +0200 Message-Id: <20190412131556.25282-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; 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"))