diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 7477657273792..cb63668df2f7a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -535,9 +535,9 @@ - `/share/vim-plugins` now only gets linked if `programs.vim.enable` is enabled -- 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`. +- The profiler from the `tracy` package no longer works on X11, since it + requires Wayland now, which is the intended default behavior by Tracy + maintainers. X11 users have to switch to the new package `tracy-glfw`. - The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained. Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead. diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 5273b41a37093..ab8f06031a93b 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -25,8 +25,11 @@ wayland-protocols, }: +assert withGtkFileSelector -> stdenv.isLinux; +assert withWayland -> stdenv.isLinux; + stdenv.mkDerivation rec { - pname = "tracy"; + pname = if withWayland then "tracy-wayland" else "tracy-glfw"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6449b5d2e024d..e0c44bedd0309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7200,7 +7200,9 @@ with pkgs; tracker = callPackage ../development/libraries/tracker { }; - tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; + tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.isLinux; }; + tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; + tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; }; trivy = callPackage ../tools/admin/trivy { };