diff options
| author | Florian Klink <flokli@flokli.de> | 2024-06-16 10:03:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-16 10:03:23 +0300 |
| commit | 69efc464387561f53f53c5bea9c5a45974c19010 (patch) | |
| tree | 3075fa0638e6445cfce6799926f4af05ac1a3bf2 /pkgs | |
| parent | 4b2ef8f2f0ad2c72c0cf639a02b0b92aa01ed46e (diff) | |
| parent | aefaf8f50bfb81a1a413a404dfcba84ee34ef50f (diff) | |
Merge pull request #315205 from widlarizer/tracy-remove-legacy
tracy: fix wayland - remove legacy build, add deps
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework (renamed from pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/tr/tracy/package.nix (renamed from pkgs/development/tools/tracy/default.nix) | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework index 0dc5a7eb68f16..0dc5a7eb68f16 100644 --- a/pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework +++ b/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 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 9ae328f6c3821..e846c3409166b 100644 --- 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 { }; |