From d48e349d2fb67ac5a416dba9a2f9961db3334de1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 30 May 2026 20:19:42 +0200 Subject: [PATCH] chrome-token-signing: migrate to pkgs/by-name --- .../ch/chrome-token-signing/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{tools/security/chrome-token-signing/default.nix => by-name/ch/chrome-token-signing/package.nix} (95%) diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/by-name/ch/chrome-token-signing/package.nix similarity index 95% rename from pkgs/tools/security/chrome-token-signing/default.nix rename to pkgs/by-name/ch/chrome-token-signing/package.nix index a32680b02f4a..c4fe48cf8a5e 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/by-name/ch/chrome-token-signing/package.nix @@ -3,8 +3,7 @@ stdenv, fetchFromGitHub, pkg-config, - wrapQtAppsHook, - qmake, + qt5, pcsclite, opensc, }: @@ -22,10 +21,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qmake + qt5.qmake pcsclite ]; dontUseQmakeConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0e11e21108..07d492a813d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11749,8 +11749,6 @@ with pkgs; vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix { }; - chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 openfst = openfst.overrideAttrs rec {