From b697a53555deae5c00ffa87d7f07feed7f145883 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 29 Oct 2025 02:27:00 +0000 Subject: [PATCH] apitrace: migrate to pkgs/by-name --- .../default.nix => by-name/ap/apitrace/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/graphics/apitrace/default.nix => by-name/ap/apitrace/package.nix} (97%) diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/by-name/ap/apitrace/package.nix similarity index 97% rename from pkgs/applications/graphics/apitrace/default.nix rename to pkgs/by-name/ap/apitrace/package.nix index e33100980a8b..b85d3de67aea 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/by-name/ap/apitrace/package.nix @@ -8,12 +8,11 @@ procps, python3, libdwarf, - qtbase, - wrapQtAppsHook, libglvnd, gtest, brotli, enableGui ? true, + libsForQt5, }: stdenv.mkDerivation rec { @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { brotli ] ++ lib.optionals enableGui [ - qtbase + libsForQt5.qtbase ]; nativeBuildInputs = [ @@ -47,7 +46,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals enableGui [ - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5e33ebd6fc3..f035f5a359f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1536,8 +1536,6 @@ with pkgs; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; - arpack-mpi = arpack.override { useMpi = true; }; asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };