From 28d42496f8e90723f56425cf04b1fec28663f08d Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 21 Jun 2020 09:02:40 -0400 Subject: [PATCH 1/2] tracy: 0.6.3 -> 0.7 --- pkgs/development/tools/tracy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index d446511298f..93a5554c371 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { - name = "tracy-${version}"; - version = "0.6.3"; + name = "tracy-${version}"; + version = "0.7"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0pgq8h5gq141zq1k4cgj6cp74kh4zqbp7h4wh29q4grjb04yy06i"; + sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glfw ] + buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; - NIX_CFLAGS_COMPILE = [] + NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation"; From 84871fb982656735337541bbec766b26baa62feb Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Sun, 21 Jun 2020 16:47:54 +0300 Subject: [PATCH 2/2] tracy: add capture and update binaries These are used to capture the trace without using the GUI tool and update the saved trace files from older to newer versions. `update` also allows to re-compress the trace files for whatever reason one might want to do it. --- pkgs/development/tools/tracy/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 93a5554c371..a5087b3b52c 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { - name = "tracy-${version}"; + pname = "tracy"; version = "0.7"; src = fetchFromGitHub { @@ -24,11 +24,15 @@ stdenv.mkDerivation rec { buildPhase = '' make -j $NIX_BUILD_CORES -C profiler/build/unix release make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release + make -j $NIX_BUILD_CORES -C capture/build/unix/ release + make -j $NIX_BUILD_CORES -C update/build/unix/ release ''; installPhase = '' install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome + install -D ./capture/build/unix/capture-release $out/bin/capture + install -D ./update/build/unix/update-release $out/bin/update ''; meta = with stdenv.lib; {