Skip to content

Commit

Permalink
tracy: split the package into tracy-wayland and tracy-glfw
Browse files Browse the repository at this point in the history
  • Loading branch information
paveloom committed Aug 22, 2024
1 parent 14544d8 commit aaa83f5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,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.
Expand Down
5 changes: 4 additions & 1 deletion pkgs/by-name/tr/tracy/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@
wayland,
}:

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 {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7430,7 +7430,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 { };

Expand Down

0 comments on commit aaa83f5

Please sign in to comment.