From patchwork Mon Oct 25 16:18:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 34035 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 926B127BBE3; Mon, 25 Oct 2021 17:20:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55D1127BBE1 for ; Mon, 25 Oct 2021 17:20:43 +0100 (BST) Received: from localhost ([::1]:58060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf2iI-0001ZB-5m for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 12:20:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf2he-0001XK-NR for guix-patches@gnu.org; Mon, 25 Oct 2021 12:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf2he-0002iE-EG for guix-patches@gnu.org; Mon, 25 Oct 2021 12:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf2he-0001an-8K for guix-patches@gnu.org; Mon, 25 Oct 2021 12:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51389] [PATCH] gnu: lttng-tools: Patch default man path. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Oct 2021 16:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51389@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16351787526046 (code B ref -1); Mon, 25 Oct 2021 16:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2021 16:19:12 +0000 Received: from localhost ([127.0.0.1]:44105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf2gq-0001ZQ-Go for submit@debbugs.gnu.org; Mon, 25 Oct 2021 12:19:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:60490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf2go-0001ZJ-Sy for submit@debbugs.gnu.org; Mon, 25 Oct 2021 12:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf2go-0000qv-MY for guix-patches@gnu.org; Mon, 25 Oct 2021 12:19:10 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:58713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf2gi-0001pp-B0 for guix-patches@gnu.org; Mon, 25 Oct 2021 12:19:10 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 19PGIk0d010852 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 25 Oct 2021 12:18:56 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 19PGIk0d010852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1635178736; bh=XwqJLu8hAUHrmjqdVGF/1eDDXfV4cFjFyYGbuqh5eT0=; h=From:To:Cc:Subject:Date:From; b=tb5SrQI/kJdSfUtzQqPQFB/hKuUM1z4/bVddUvqph+OjpOelzKosKWiQ+pLQBGlS7 wevuS2OVO1b8wNFtzyXr+mH8BdpFoShuhNjMcWe3eKQi6E9FwTYGFBKKyvcwTav5Pi Kxx6FvOGIMAz+wPwZx6xKCOdqiRfqKhLJS99CgMo= Date: Mon, 25 Oct 2021 12:18:43 -0400 Message-Id: <20211025161843.7507-1-olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Mon, 25 Oct 2021 16:18:46 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Olivier Dion X-ACL-Warn: , Olivier Dion via Guix-patches X-Patchwork-Original-From: Olivier Dion via Guix-patches via From: Olivier Dion X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (lttng-tools) [arguments]: Add 'patch-default-man-path after 'unpack phase. --- gnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 61ec6d8657..3b4da16d78 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8167,7 +8167,12 @@ (define-public lttng-tools (add-before 'configure 'set-environment-variables (lambda _ (setenv "HOME" "/tmp") - (setenv "LTTNG_HOME" "/tmp")))))) + (setenv "LTTNG_HOME" "/tmp"))) + ;; We don't put (which "man") here because LTTng uses execlp. + (add-after 'unpack 'patch-default-man-path + (lambda _ + (substitute* "src/common/defaults.h" + (("/usr/bin/man") "man"))))))) ;; NOTE - Users have to install python-3 in their profile to use the ;; bindings. We don't put it in the inputs, because the rest of the tools ;; can work without it.