From af86a398976544fb9a939cdab9bf053cbdf2fd2f Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 29 Oct 2025 02:27:40 +0000 Subject: [PATCH] tpmmanager: migrate to pkgs/by-name --- .../default.nix => by-name/tp/tpmmanager/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/misc/tpmmanager/default.nix => by-name/tp/tpmmanager/package.nix} (92%) diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/by-name/tp/tpmmanager/package.nix similarity index 92% rename from pkgs/applications/misc/tpmmanager/default.nix rename to pkgs/by-name/tp/tpmmanager/package.nix index 2164b56642b8..b9a6ac8a1f5c 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/by-name/tp/tpmmanager/package.nix @@ -2,10 +2,8 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - wrapQtAppsHook, trousers, + libsForQt5, }: stdenv.mkDerivation rec { @@ -20,12 +18,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase trousers ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d03821feac35..db18aee81b21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4105,8 +4105,6 @@ with pkgs; trackma-qt = trackma.override { withQT = true; }; - tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; - trezorctl = with python3Packages; toPythonApplication trezor; trezor-agent = with python3Packages; toPythonApplication trezor-agent;