qMasterPassword: use qt6

This commit is contained in:
teutat3s
2022-11-07 15:20:20 +01:00
parent d3e91e9b3d
commit 92cfa0563e
2 changed files with 18 additions and 6 deletions
@@ -1,6 +1,18 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }:
{ lib
, stdenv
, fetchFromGitHub
, libX11
, libXtst
, qmake
, qtbase
, qttools
, qtwayland
, openssl
, libscrypt
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qMasterPassword";
version = "1.2.4";
@@ -11,8 +23,8 @@ mkDerivation rec {
sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";
};
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
# Upstream install is mostly defunct. It hardcodes target.path and doesn't
# install anything but the binary.
@@ -46,7 +58,7 @@ mkDerivation rec {
'';
homepage = "https://github.com/bkueng/qMasterPassword";
license = licenses.gpl3;
maintainers = [ maintainers.tadeokondrak ];
maintainers = with lib.maintainers; [ tadeokondrak ];
platforms = platforms.all;
};
}
+1 -1
View File
@@ -36997,7 +36997,7 @@ with pkgs;
gtk2 = gtk2-x11;
};
qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };