diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e645c06f109a1..6c92a56592c2e 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -64,6 +64,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} diff --git a/pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework similarity index 100% rename from pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework rename to pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/by-name/tr/tracy/package.nix similarity index 93% rename from pkgs/development/tools/tracy/default.nix rename to pkgs/by-name/tr/tracy/package.nix index 63df201f16193..82d4b9c285b82 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/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 index 169e0f6bc72c7..928b5d5bfb2a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7584,7 +7584,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 { };