From patchwork Sun Sep 24 17:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 54275 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 5401627BBE9; Sun, 24 Sep 2023 18:16:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 084F427BBE2 for ; Sun, 24 Sep 2023 18:16:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkSi2-0005tU-DQ; Sun, 24 Sep 2023 13:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qkSi0-0005t3-2Q for guix-patches@gnu.org; Sun, 24 Sep 2023 13:15:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qkShz-0001LX-6F for guix-patches@gnu.org; Sun, 24 Sep 2023 13:15:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkSiB-0007mf-23 for guix-patches@gnu.org; Sun, 24 Sep 2023 13:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65106] [PATCH v2 2/2] gnu: Add tracy. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 17:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 65106@debbugs.gnu.org Cc: maxim.cournoyer@gmail.com Received: via spool by 65106-submit@debbugs.gnu.org id=B65106.169557570429830 (code B ref 65106); Sun, 24 Sep 2023 17:16:03 +0000 Received: (at 65106) by debbugs.gnu.org; 24 Sep 2023 17:15:04 +0000 Received: from localhost ([127.0.0.1]:43562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkShE-0007kz-Dd for submit@debbugs.gnu.org; Sun, 24 Sep 2023 13:15:04 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:41629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkSh9-0007ji-BW for 65106@debbugs.gnu.org; Sun, 24 Sep 2023 13:14:59 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B35EC32009DB; Sun, 24 Sep 2023 13:14:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 24 Sep 2023 13:14:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1695575681; x= 1695662081; bh=HLxxBZybq4ABe0/Yeb4s6bODg8U/6eUarFCDfdxjPbo=; b=O sJG0WU5ZXVbHxIH6DcKPGpHIt1W+rK2LRxJzIbd7O8W1L+sFTjzEHahY5a2NlUer WVPg6Z9iqAist/hq8rFZ99ZOZGmAHt0K9zSKRBsbuDZYRr1qcNKqvzp9KHZ0Qptx Auepy8IjZ5+gPDPuFcBRAqbqJ0WqFZ/ox56yUJrNQ6a+61xE/by2+8vRn92eEm/Z cDs0WIqqSBEkJmnH/geIZ0eJZaTJmNlGSCPvKsnWmJCDwybEVba7bksaL2m0FsS/ V3lMmXOuFLJBQSdnfR05MLsiYvFtF+csg6o1e5scIDdcWz74H+ZqszUyzczFaYs4 bpmUNO3oePgPOlFSdWROA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1695575681; x= 1695662081; bh=HLxxBZybq4ABe0/Yeb4s6bODg8U/6eUarFCDfdxjPbo=; b=T jBcRrRC2DBCqHm0ccgkYYmVi96hLvHQRWuDqWcC0/iDWVF2SL8VJRWjDXjQCRth7 L68cEqo5YVxLXHQzOjZSFreK2pj39P9Ip/B66XalQmdacgNTgtxFuUvSqKQ7rO9E YVb/3NMTgGWOEQEe3YV3sIEysSJb9aFxohP+YRxDbxmv6Ws97d1ESlkWHBeWBtJX dLDGUbDV3xh7wRndf4qUSJUOl2g5c0AmkmSC2D0Svb1dx+IqoR1LdpBtioIvd9UL 9UOHQ4Pdh6dbBssU1uYBntXBjyI1HGymcg5akvPgCd6A6xYA1jOePwvFpYMCIXL/ vmGGG2oM+GUGRAYTNaoAQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudelvddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffr rghtthgvrhhnpedtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddute dtgedtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 24 Sep 2023 13:14:39 -0400 (EDT) From: dan Date: Mon, 25 Sep 2023 01:14:00 +0800 Message-ID: <20230924171400.7496-3-i@dan.games> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230924171400.7496-1-i@dan.games> References: <20230924171400.7496-1-i@dan.games> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/profiling.scm (tracy): New variable. --- gnu/packages/profiling.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index af79488c30..5f5b4b07d0 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -438,3 +438,31 @@ (define-public tracy-wayland "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.") (license license:bsd-3))) + +(define-public tracy + (package + (inherit tracy-wayland) + (name "tracy") + (inputs (modify-inputs (package-inputs tracy-wayland) + (delete "libxkbcommon" "wayland") + (prepend glfw))) + (arguments + (substitute-keyword-arguments (package-arguments tracy-wayland) + ((#:make-flags flags + #~'()) + #~(append #$flags + ;; The LEGACY flag indicate we want to build tracy with glfw + (list "LEGACY=1"))) + ((#:phases phases) + #~(modify-phases #$phases + ;; Tracy depends on glfw to load libGL.so, but glfw doesn't have + ;; mesa in its rpath. Thus, we need to manually modify tracy's + ;; LD_LIBRARY_PATH. + (add-after 'install 'wrap-program + (lambda _ + (let ((out (string-append #$output "/bin/tracy")) + (mesa (string-append #$(this-package-input "mesa") + "/lib"))) + (wrap-program out + `("LD_LIBRARY_PATH" ":" = + (,mesa))))))))))))