Merge pull request #315205 from widlarizer/tracy-remove-legacy

tracy: fix wayland - remove legacy build, add deps
NixOS · Jun 16, 2024 · 69efc46 · 69efc46
2 parents 4b2ef8f + aefaf8f
commit 69efc46
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -67,6 +67,10 @@
  services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };
  ```
 
+- The `tracy` package no longer works on X11, since it's moved to Wayland
+ support, which is the intended default behavior by Tracy maintainers.
+ X11 users have to switch to the new package `tracy-x11`.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

diff --git a/...1-remove-unifiedtypeidentifiers-framework → ...1-remove-unifiedtypeidentifiers-framework b/...1-remove-unifiedtypeidentifiers-framework → ...1-remove-unifiedtypeidentifiers-framework
diff --git a/pkgs/development/tools/tracy/default.nix → pkgs/by-name/tr/tracy/package.nix b/pkgs/development/tools/tracy/default.nix → pkgs/by-name/tr/tracy/package.nix
@@ -10,6 +10,10 @@
 , hicolor-icon-theme
 , pkg-config
 , tbb
+
+, withWayland ? stdenv.isLinux
+, libxkbcommon
+, wayland
 }:
 
 stdenv.mkDerivation rec {
@@ -33,6 +37,9 @@ stdenv.mkDerivation rec {
  capstone
  freetype
  glfw
+ ] ++ lib.optionals (stdenv.isLinux && withWayland) [
+ libxkbcommon
+ wayland
  ] ++ lib.optionals stdenv.isLinux [
  dbus
  hicolor-icon-theme
@@ -60,7 +67,8 @@ stdenv.mkDerivation rec {
  make -j $NIX_BUILD_CORES -C csvexport/build/unix release
  make -j $NIX_BUILD_CORES -C import-chrome/build/unix release
  make -j $NIX_BUILD_CORES -C library/unix release
- make -j $NIX_BUILD_CORES -C profiler/build/unix release LEGACY=1
+ make -j $NIX_BUILD_CORES -C profiler/build/unix release \
+ ${lib.optionalString (stdenv.isLinux && !withWayland) "LEGACY=1"}
  make -j $NIX_BUILD_CORES -C update/build/unix release
 
  runHook postBuild

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7575,7 +7575,7 @@ with pkgs;
 
  tracker = callPackage ../development/libraries/tracker { };
 
- tracy = callPackage ../development/tools/tracy { };
+ tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
 
  trivy = callPackage ../tools/admin/trivy { };