From cddd1f1ffc6a0115720907c99d178bdf879e4301 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:27:29 +0000 Subject: [PATCH] qtpass: migrate to pkgs/by-name --- .../qt/qtpass/package.nix} | 20 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) rename pkgs/{applications/misc/qtpass/default.nix => by-name/qt/qtpass/package.nix} (89%) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/by-name/qt/qtpass/package.nix similarity index 89% rename from pkgs/applications/misc/qtpass/default.nix rename to pkgs/by-name/qt/qtpass/package.nix index 60cfc60bd138..bfe9f0238874 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/by-name/qt/qtpass/package.nix @@ -1,17 +1,13 @@ { + stdenv, fetchFromGitHub, lib, - stdenv, + libsForQt5, git, gnupg, pass, pwgen, qrencode, - qtbase, - qtsvg, - qttools, - qmake, - wrapQtAppsHook, makeWrapper, }: @@ -35,20 +31,20 @@ stdenv.mkDerivation rec { git gnupg pass - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook makeWrapper ]; qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: - "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + "QMAKE_LUPDATE=${libsForQt5.qttools.dev}/bin/lupdate" ]; qtWrapperArgs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84448f2750a6..4226903662bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11866,8 +11866,6 @@ with pkgs; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override {