tracy: move to wayland, add tracy-x11

This commit is contained in:
Emil J. Tywoniak 2024-06-15 22:52:03 +02:00
parent 9b4b3c2959
commit aefaf8f50b
4 changed files with 14 additions and 2 deletions

View File

@ -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}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@ -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

View File

@ -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 { };