tracy: cleanup

pkgs/development/tools/tracy/default.nix

@@ -1,10 +1,20 @@
-{ stdenv, lib, darwin, fetchFromGitHub
-, tbb, glfw, pkg-config, freetype, Carbon, AppKit, capstone, dbus, hicolor-icon-theme
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, capstone
+, freetype
+, glfw
+, dbus
+, hicolor-icon-theme
+, tbb
+, darwin
 }:
 
 let
   disableLTO = stdenv.cc.isClang && stdenv.isDarwin;  # workaround issue #19098
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "tracy";
   version = "0.9.1";
 
@@ -15,15 +25,26 @@ in stdenv.mkDerivation rec {
     sha256 = "sha256-K1lQNRS8+ju9HyKNVXtHqslrPWcPgazzTitvwkIO3P4";
   };
 
-  patches = [ ]
-    ++ lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ ./0001-remove-unifiedtypeidentifiers-framework ];
+  patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [
+    ./0001-remove-unifiedtypeidentifiers-framework
+  ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ glfw capstone ]
-    ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
-    ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]
-    ++ lib.optionals stdenv.isLinux [ tbb dbus hicolor-icon-theme freetype ];
+  buildInputs = [
+    capstone
+    freetype
+    glfw
+  ] ++ lib.optionals stdenv.isLinux [
+    dbus
+    hicolor-icon-theme
+    tbb
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+    darwin.apple_sdk.frameworks.Carbon
+  ] ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [
+    darwin.apple_sdk.frameworks.UniformTypeIdentifiers
+  ];
 
   env.NIX_CFLAGS_COMPILE = toString ([ ]
     # Apple's compiler finds a format string security error on
@@ -33,20 +54,26 @@ in stdenv.mkDerivation rec {
     ++ lib.optional stdenv.cc.isClang "-faligned-allocation"
     ++ lib.optional disableLTO "-fno-lto");
 
-  NIX_CFLAGS_LINK = lib.optional disableLTO "-fno-lto";
-
   buildPhase = ''
+    runHook preBuild
+
     make -j $NIX_BUILD_CORES -C profiler/build/unix release LEGACY=1
     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
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     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
+
+    runHook postInstall
   '';
 
   postFixup = lib.optionalString stdenv.isDarwin ''

pkgs/top-level/all-packages.nix

@@ -7043,9 +7043,7 @@ with pkgs;
 
   tracker-miners = callPackage ../development/libraries/tracker-miners { };
 
-  tracy = callPackage ../development/tools/tracy {
-    inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
-  };
+  tracy = callPackage ../development/tools/tracy { };
 
   tridactyl-native = callPackage ../tools/networking/tridactyl-native { };