diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index af0c1d6ca6f3..2cdc3bdd9f3a 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,18 +1,30 @@ -{ 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.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "bkueng"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eUJD9FoGaDzADKm3wZHs5Bhdt7RoM1WTTVNP6xUV7gs="; + 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 teutat3s ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be8a61010524..c1405b5b614d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37081,7 +37081,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 { };