From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EOGXNWopkWHlnQAAgWs5BA (envelope-from ) for ; Sun, 14 Nov 2021 16:21:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CF5PMWopkWHUbgAA1q6Kng (envelope-from ) for ; Sun, 14 Nov 2021 15:21:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6D9E137C91 for ; Sun, 14 Nov 2021 16:21:14 +0100 (CET) Received: from localhost ([::1]:37952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmHJh-0000b1-LA for larch@yhetil.org; Sun, 14 Nov 2021 10:21:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmHJW-0000YZ-Uo for bug-guix@gnu.org; Sun, 14 Nov 2021 10:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmHJW-0002vc-Ll for bug-guix@gnu.org; Sun, 14 Nov 2021 10:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmHJW-0002px-Ho for bug-guix@gnu.org; Sun, 14 Nov 2021 10:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51798: [PATCH v2] gnu: bashtop: Add dependencies and wrap program with PATH Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 14 Nov 2021 15:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51798 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Lenny =?UTF-8?Q?H=C3=A4ndler?= , 51798@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 51798-submit@debbugs.gnu.org id=B51798.163690321110802 (code B ref 51798); Sun, 14 Nov 2021 15:21:02 +0000 Received: (at 51798) by debbugs.gnu.org; 14 Nov 2021 15:20:11 +0000 Received: from localhost ([127.0.0.1]:51344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmHIg-0002o8-PA for submit@debbugs.gnu.org; Sun, 14 Nov 2021 10:20:11 -0500 Received: from jpoiret.xyz ([206.189.101.64]:37412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmHIe-0002ny-VX for 51798@debbugs.gnu.org; Sun, 14 Nov 2021 10:20:09 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 973D0184F5F; Sun, 14 Nov 2021 15:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1636903208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zA5iaEqTSZhG6BrniMzDsKleWvoopaMZEFtKoCt3JDI=; b=sI4Zw9fvC3FiUgWNrCTLDnNiqA8DmqHGsVj6Qc8qkcxNnS0Oo7tM83poRDMJOx/pzfO/dL 7gKSX64h2/hk3Pm1mU2WW4s+Xzyq22hH8FmlvNXfjxkM5tDXQ3085WagXFWWI5wx229Rpw dD7YrVUA54VpqtNi9dFlJYznNO8rTARGBlEXTnDqq59+XjTTG2TJ+xafze7y1i9/OI7UYE TEaoYXP89tpulFQMoCR4UxVKapVxzaYp5T60VQ2GBqrsiKCWlp8zkXrD/uvca+kyI7z/Xk OmhhcpKY8ErzOPJUhjzeLZdb3b4yBEQJTJfoOwHjy9t+tJ50920/xQp6S0IZYw== Date: Sun, 14 Nov 2021 15:19:49 +0000 Message-Id: <20211114151949.19754-1-dev@jpoiret.xyz> In-Reply-To: <20211114140137.13868-1-dev@jpoiret.xyz> References: <20211114140137.13868-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Josselin Poiret From: Josselin Poiret via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636903274; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=zA5iaEqTSZhG6BrniMzDsKleWvoopaMZEFtKoCt3JDI=; b=fnzZXSUeKjh3K3Q2lqVVNZ+iU266Oyngw+is9HObFpSmGay7BPJJvnVcczNGFoCnGNyhKM EBd74EHq+eqT2PNA97NsND/8gGTkldKtvaubM3lmUUTy9MIZOro++1ZspzYY+lrGIBBIZg nisfP7cGmPw8W/A6DvodENSMDIzoykC+dTeXhsnYgvUHdI7IqMvJBkGMe/31UqnpNpSQ2h 6JMF9ZIC40Ej7YCec2/70IXflPLvExWGYsQx0Y4DgU1TnBITs4zCmoOn+vosamAuBO3X0Y TM19Z5TbDzDhzx2Ynu+nojLoZT71D9WlpVVK5nfxXLOBXrKtRWhDd30mnoi5ZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636903274; a=rsa-sha256; cv=none; b=DUkDoJYEl3jXD7tnCwKGeaTZMjvxXzK9pExchWdXz3yWXQuKH+UKIfmmck6A1b2LIs0DYs fBAb3KhN/btznP+Jlv+HHUoWLyP4wz1qO7Rqreq07S6rZsDlAMoyApJaBHscu84XewkScZ 9QBboXQny4mo8ufkfbfM/Se6Bu+EPgdflUowpkP1KJfq3szyZDDbzF//aV1AjAOOyAJX/q 0pjF0c9Mz4KeoXg5POFiXYYr00QSynZDtHSW5oIbWEsNOXiLTkDo6fMqthq7xltnggWeTW N5ZWPJJKW9LlYWd0YtD3NcoY31mpkEwsUHl/rlRMGEqEezgugzuNJeZ3i+Hedw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=sI4Zw9fv; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 0.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=sI4Zw9fv; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 6D9E137C91 X-Spam-Score: 0.66 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZRdcN7EzKiwR Sorry for the noise, but the patch I just sent wasn't up to satisfaction: using `which` in the build phases breaks cross-compilation, and the build-system change was a bit of an unwarranted change. Here's a modified patch! Best, Josselin Poiret -- >8 -- * gnu/packages/admin.scm (bashtop): Add dependencies, wrap the script so that it can access the commands it needs. --- gnu/packages/admin.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2a7b0f310d..fe3987a9b8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -674,7 +674,29 @@ (define-public bashtop (arguments '(#:make-flags (list (string-append "PREFIX=" %output)) #:tests? #f ; bats test fails with loading load.bash - #:phases (modify-phases %standard-phases (delete 'configure)))) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((path (map (lambda (input) + (string-append (assoc-ref inputs + input) + "/bin")) + '("coreutils" "gawk" "glibc" "grep" + "iproute" "procps" "sed"))) + (bashtop (string-append (assoc-ref outputs + "out") + "/bin/bashtop"))) + (wrap-program bashtop + `("PATH" ":" = ,path)))))))) + (inputs + `(("coreutils" ,coreutils) + ("gawk" ,gawk) + ("glibc" ,glibc) ; needed for the 'locale' binary + ("grep" ,grep) + ("iproute" ,iproute) + ("procps" ,procps) + ("sed" ,sed))) (home-page "https://github.com/aristocratos/bashtop") (synopsis "Linux/OSX/FreeBSD resource monitor") (description "Resource monitor that shows usage and stats for processor, -- 2.33.1