From 59d8cd8cb653b922b2dd125062c35981295d4ca4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 5 Apr 2021 16:26:01 +0100 Subject: [PATCH 1/2] tracy: force-disable LTO for darwin --- pkgs/development/tools/tracy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index b7a324ca29d..8d597ce5eda 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: -stdenv.mkDerivation rec { +let + disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 +in stdenv.mkDerivation rec { pname = "tracy"; version = "0.7.7"; @@ -19,7 +21,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" - ++ lib.optional stdenv.cc.isClang "-faligned-allocation"; + ++ lib.optional stdenv.cc.isClang "-faligned-allocation" + ++ lib.optional disableLTO "-fno-lto"; + + NIX_CFLAGS_LINK = lib.optional disableLTO "-fno-lto"; buildPhase = '' make -j $NIX_BUILD_CORES -C profiler/build/unix release From d5cbe9183fe97818565fe3a2e1d4dc9467f1f5c1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 5 Apr 2021 19:00:53 +0100 Subject: [PATCH 2/2] tracy: fixupPhase -> postFixup, because linting --- pkgs/development/tools/tracy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 8d597ce5eda..724e74098de 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { install -D ./update/build/unix/update-release $out/bin/update ''; - fixupPhase = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy '';